]> granicus.if.org Git - handbrake/commitdiff
contrib: Make x264 cross options valid for all cross, not just mingw.
authorBradley Sepos <bradley@bradleysepos.com>
Thu, 28 Dec 2017 19:50:29 +0000 (14:50 -0500)
committerBradley Sepos <bradley@bradleysepos.com>
Wed, 10 Jan 2018 06:39:55 +0000 (01:39 -0500)
Also set CONFIGURE.build to null since the configure script has no clue about --build.

contrib/x264/module.defs

index 220e756e8ffd42a6122f20771cbd9f63d79b9a55..b8a5d2d5a7855f70c97363a1b475aa2bf9f8311b 100644 (file)
@@ -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)"