Build: pass --build to configure when cross-compiling.

This is the right thing to do, and also happens to fix building
with MinGW-w64 in a non-Linux environment such as e.g. Cygwin.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6104 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 3884487c294cb6e505473341bc37afbfb9ba5027..b04c65bb494dc84011535c1086ff88898577704d 100644 (file)
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -7,9 +7,10 @@ $(eval $(call import.CONTRIB.defs,FFMPEG))
 
 FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v10_beta1.tar.bz2
 
-FFMPEG.CONFIGURE.deps =
-FFMPEG.CONFIGURE.env  =
-FFMPEG.CONFIGURE.host =
+FFMPEG.CONFIGURE.deps  =
+FFMPEG.CONFIGURE.env   =
+FFMPEG.CONFIGURE.host  =
+FFMPEG.CONFIGURE.build =
 
 FFMPEG.CONFIGURE.extra = \
     --enable-gpl \

diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index c3f815a772e59efe809f337790146b7796445ddf..fffddb8ca7642aa28071585cc6f91033641a3969 100644 (file)
--- a/make/include/contrib.defs
+++ b/make/include/contrib.defs
@@ -1,6 +1,7 @@
 CONTRIB.build/    = $(BUILD/)contrib/
 CONTRIB.download/ = $(SRC/)download/
 CONTRIB.host      = $(if $(filter 1,$(BUILD.cross)),$(BUILD.spec))
+CONTRIB.spec      = $(if $(filter 1,$(BUILD.cross)),$(HOST.spec))
 
 ###############################################################################
 
@@ -71,6 +72,7 @@ define import.CONTRIB.defs
     $(1).CONFIGURE.bootstrap  =
     $(1).CONFIGURE.exe        = ./configure
     $(1).CONFIGURE.host       = $$(CONTRIB.host)
+    $(1).CONFIGURE.build      = $$(CONTRIB.spec)
     $(1).CONFIGURE.prefix     = $$(call fn.ABSOLUTE,$$(CONTRIB.build/))
     $(1).CONFIGURE.deps       = --disable-dependency-tracking
     $(1).CONFIGURE.shared     = --disable-shared
@@ -79,9 +81,10 @@ define import.CONTRIB.defs
 
     $(1).CONFIGURE.args.dir    = cd $$(1);
     $(1).CONFIGURE.args.host   = --host=$$(1)
+    $(1).CONFIGURE.args.build  = --build=$$(1)
     $(1).CONFIGURE.args.prefix = --prefix=$$(1)
 
-    $(1).CONFIGURE.args = !sete @dir !bootstrap !env !exe @host @prefix !deps !shared !static !extra
+    $(1).CONFIGURE.args = !sete @dir !bootstrap !env !exe @host @build @prefix !deps !shared !static !extra
 
     $(1).CONFIGURE.env.LOCAL_PATH =
     $(1).CONFIGURE.env.CC       = CC=$$($(1).GCC.gcc)