diff options
| author | Rodeo <[email protected]> | 2014-03-13 01:20:38 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2014-03-13 01:20:38 +0000 |
| commit | 74bc2e472c901e75412dd82845e6cc16277eff1d (patch) | |
| tree | 54e4271443a7686b173bca96833536a48378ce1a | |
| parent | 30e3f1f16c300138dd83b2309c1f8687a1ed6fbc (diff) | |
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
| -rw-r--r-- | contrib/ffmpeg/module.defs | 7 | ||||
| -rw-r--r-- | make/include/contrib.defs | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 3884487c2..b04c65bb4 100644 --- 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 c3f815a77..fffddb8ca 100644 --- 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) |