diff options
| author | bors <bors@rust-lang.org> | 2014-09-24 05:10:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-09-24 05:10:45 +0000 |
| commit | 9cce2b7bab948805e48e63ec4eb60f04004a5138 (patch) | |
| tree | f30840d26ec010aace76a2a47b491301b3856de2 | |
| parent | c8bafe0466e6abb7342fc72fdf276d70ae83205b (diff) | |
| parent | bcc4ee0dbcdf3a3c9fd9ca07663bd6651a0cb2ee (diff) | |
auto merge of #17449 : mcoffin/rust/master, r=alexcrichton
Right now, libuv will **always** be built for the host system (at least when building on OSX) because the information about the cross compiler is never actually passed to GYP. I don't know how anybody has been managing to build cross compilers with this. Note that, at least on OSX, there is a bug in GYP that will send clang flags to non-clang compilers and it will still attempt to use Xcode's libtool, so this doesn't completely fix the problem of cross-compiling on an OSX host, but it's a start.
| -rw-r--r-- | mk/rt.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index 63bfc4e1033..1e5165b77fa 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)) \ @@ -225,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) |