diff options
| author | bors <bors@rust-lang.org> | 2013-05-02 07:15:39 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-02 07:15:39 -0700 |
| commit | 89377eafe163eee7f636a758ef117399f58c3598 (patch) | |
| tree | 067c9eb84ac129bc94388006fa169855c2d6593b | |
| parent | 326d9661b7cdeb0e429468b378fb2af716a3a955 (diff) | |
| parent | d6697e702774c422871499826e7d346320610242 (diff) | |
auto merge of #6176 : thestinger/rust/libuv_optimize, r=thestinger
Closes #6142
| -rw-r--r-- | mk/rt.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index 015992abf78..c4c80b99fc0 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -163,14 +163,16 @@ endif ifdef CFG_WINDOWSY_$(1) $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS) $$(Q)$$(MAKE) -C $$(S)src/libuv/ \ + CFLAGS="$$(CFG_GCCISH_CFLAGS)" \ + LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS)" \ builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \ OS=mingw \ V=$$(VERBOSE) else ifeq ($(OSTYPE_$(1)), linux-androideabi) $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS) $$(Q)$$(MAKE) -C $$(S)src/libuv/ \ - CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \ - LDFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \ + CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \ + LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \ CC="$$(CC_$(1))" \ CXX="$$(CXX_$(1))" \ AR="$$(AR_$(1))" \ @@ -181,8 +183,8 @@ $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS) else $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS) $$(Q)$$(MAKE) -C $$(S)src/libuv/ \ - CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \ - LDFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \ + CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \ + LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \ CC="$$(CC_$(1))" \ CXX="$$(CXX_$(1))" \ AR="$$(AR_$(1))" \ |