From: Bradley Sepos <bradley@bradleysepos.com>
Date: Thu, 28 Dec 2017 19:50:29 +0000 (-0500)
Subject: contrib: Make x264 cross options valid for all cross, not just mingw.
X-Git-Tag: 1.1.0~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a230d06074defae003bf68df419907d08c64a16b;p=handbrake

contrib: Make x264 cross options valid for all cross, not just mingw.

Also set CONFIGURE.build to null since the configure script has no clue about --build.
---

diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index 220e756e8..b8a5d2d5a 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -12,7 +12,8 @@ X264.CONFIGURE.shared =
 
 X264.CONFIGURE.extra += --disable-lavf --disable-ffms --disable-avs --disable-swscale --disable-gpac --disable-lsmash --disable-cli
 
-ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+ifeq (1,$(BUILD.cross))
+    X264.CONFIGURE.build  =
     X264.CONFIGURE.extra += --cross-prefix=$(BUILD.spec)-
     X264.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver ?extra)"
     X264.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver)"