From 650683f926d21b59ba7ad37e6b09130fa1a368c1 Mon Sep 17 00:00:00 2001 From: Matt Coffin Date: Mon, 22 Sep 2014 12:31:53 -0600 Subject: [PATCH 1/2] Ensure that compiler environment is passed to gyp this only affects libuv --- mk/rt.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mk/rt.mk b/mk/rt.mk index 63bfc4e10336a..00e301f8fbf58 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -203,6 +203,9 @@ LIBUV_CFLAGS_$(1) := $(subst -Werror,,$(CFG_GCCISH_CFLAGS_$(1))) $$(LIBUV_MAKEFILE_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS) $$(LIBUV_STAMP_$(1)) (cd $(S)src/libuv/ && \ + CC="$$(CC_$(1))" \ + CXX="$$(CXX_$(1))" \ + AR="$$(AR_$(1))" \ $$(CFG_PYTHON) ./gyp_uv.py -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) \ -D ninja \ -DOS=$$(LIBUV_OSTYPE_$(1)) \ From bcc4ee0dbcdf3a3c9fd9ca07663bd6651a0cb2ee Mon Sep 17 00:00:00 2001 From: Matt Coffin Date: Mon, 22 Sep 2014 12:40:08 -0600 Subject: [PATCH 2/2] Copy GYP environment variables on iOS --- mk/rt.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mk/rt.mk b/mk/rt.mk index 00e301f8fbf58..1e5165b77faa6 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -228,6 +228,9 @@ else ifeq ($(OSTYPE_$(1)), apple-ios) # iOS $$(LIBUV_XCODEPROJ_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS) $$(LIBUV_STAMP_$(1)) cp -rf $(S)src/libuv/ $$(LIBUV_BUILD_DIR_$(1)) (cd $$(LIBUV_BUILD_DIR_$(1)) && \ + CC="$$(CC_$(1))" \ + CXX="$$(CXX_$(1))" \ + AR="$$(AR_$(1))" \ $$(CFG_PYTHON) ./gyp_uv.py -f xcode \ -D ninja \ -R libuv)