diff options
| -rw-r--r-- | contrib/libvpx/module.defs | 7 | ||||
| -rw-r--r-- | make/include/contrib.defs | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs index c2c0c4aea..e257d3493 100644 --- a/contrib/libvpx/module.defs +++ b/contrib/libvpx/module.defs @@ -3,8 +3,6 @@ $(eval $(call import.CONTRIB.defs,LIBVPX)) LIBVPX.FETCH.url = http://download.handbrake.fr/contrib/libvpx-v1.3.0.tar.bz2 -LIBVPX.CONFIGURE.env.LD = LD=$(subst CC=,,$(LIBVPX.CONFIGURE.env.CC)) - LIBVPX.CONFIGURE.args.host = LIBVPX.CONFIGURE.deps = LIBVPX.CONFIGURE.extra = \ @@ -15,6 +13,11 @@ LIBVPX.CONFIGURE.extra = \ --disable-docs \ --disable-unit-tests +ifeq (1,$(BUILD.cross)) + LIBVPX.CONFIGURE.env.CROSS = CROSS="$(BUILD.spec)-" + LIBVPX.CONFIGURE.args.build = +endif + ifeq (1-i686,$(BUILD.cross)-$(BUILD.machine)) LIBVPX.CONFIGURE.extra += --target=x86-win32-gcc else ifeq (1-x86_64,$(BUILD.cross)-$(BUILD.machine)) diff --git a/make/include/contrib.defs b/make/include/contrib.defs index 800f1c56c..2c16c5b3c 100644 --- a/make/include/contrib.defs +++ b/make/include/contrib.defs @@ -108,7 +108,7 @@ define import.CONTRIB.defs $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="-L$$(call fn.ABSOLUTE,$(CONTRIB.build/))lib $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra.exe *D)" $(1).CONFIGURE.env.PKG_CONFIG_PATH = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig" - $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LD !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH + $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LD !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH !CROSS $(1).CONFIGURE.env = $$(call fn.ARGS,$(1).CONFIGURE.env,$$($(1).CONFIGURE.env.args)) $(1).CONFIGURE.target = $$($(1).build/).stamp.configure |