From: Bradley Sepos <bradley@bradleysepos.com>
Date: Fri, 1 Jun 2018 20:13:55 +0000 (-0400)
Subject: contrib: Explicitly pass arch to FFmpeg on macOS x86_64.
X-Git-Tag: 1.2.0~417
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1dddfebf0976245f6c9295fa5fef07c8a695db9;p=handbrake

contrib: Explicitly pass arch to FFmpeg on macOS x86_64.

Fixes FFmpeg configure error on macOS:

```
./configure: line 588: eval: --: invalid option
eval: usage: eval [arg ...]
make[1]: *** [contrib/ffmpeg/.stamp.ffmpeg.configure] Error 2
```

...caused by attempting to `eval --arch=x86_64=yes`.
---

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index c8d729ff7..36d04b2db 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -73,6 +73,9 @@ FFMPEG.CONFIGURE.extra += \
 
 ifeq (darwin,$(BUILD.system))
     FFMPEG.CONFIGURE.extra += --disable-audiotoolbox --disable-coreimage --disable-videotoolbox
+    ifeq (x86_64,$(BUILD.arch))
+        FFMPEG.CONFIGURE.extra += --arch=x86_64
+    endif
 endif
 
 ## check against tuple: B-SYSTEM where B is { 0 | 1 } for cross-compiling flag