File tree 1 file changed +2
-2
lines changed
1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -149,10 +149,10 @@ rt/$(1)/stage$(2)/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$(1)_$(2))
149
149
$$(Q )$(AR_$(1 ) ) rcs $$@ $$<
150
150
151
151
rt/$(1 ) /stage$(2 ) /$(CFG_RUNTIME_$(1 ) ) : $$(RUNTIME_OBJS_$(1 ) _$(2 ) ) $$(MKFILE_DEPS ) \
152
- $$(RUNTIME_DEF_$(1 ) _$(2 ) ) $$(LIBUV_LIB_$(1 ) _$(2 ) )
152
+ $$(RUNTIME_DEF_$(1 ) _$(2 ) ) $$(LIBUV_LIB_$(1 ) _$(2 ) ) $$( JEMALLOC_LIB_ $( 1 ) _ $( 2 ) )
153
153
@$$(call E, link: $$@ )
154
154
$$(Q )$$(call CFG_LINK_CXX_$(1 ) ,$$@ , $$(RUNTIME_OBJS_$(1 ) _$(2 ) ) \
155
- $$(CFG_GCCISH_POST_LIB_FLAGS_$(1 ) ) $$(LIBUV_LIB_$(1 ) _$(2 ) ) \
155
+ $$(JEMALLOC_LIB_ $( 1 ) _ $( 2 ) ) $$( CFG_GCCISH_POST_LIB_FLAGS_$(1 ) ) $$(LIBUV_LIB_$(1 ) _$(2 ) ) \
156
156
$$(CFG_LIBUV_LINK_FLAGS_$(1 ) ) ,$$(RUNTIME_DEF_$(1 ) _$(2 ) ) ,$$(CFG_RUNTIME_$(1 ) ) )
157
157
158
158
# FIXME: For some reason libuv's makefiles can't figure out the
You can’t perform that action at this time.
4 commit comments
bors commentedon Aug 19, 2013
saw approval from brson
at https://github.com/thestinger/rust/commit/0dceabda7f1049fd70d38cf61c80dd5148fdca4e
bors commentedon Aug 19, 2013
merging thestinger/rust/jemalloc = 0dceabd into auto
bors commentedon Aug 19, 2013
thestinger/rust/jemalloc = 0dceabd merged ok, testing candidate = c934f759
bors commentedon Aug 19, 2013
some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/168
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/977
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/980
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/86
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/86
exception: http://buildbot.rust-lang.org/builders/auto-mac-all-opt/builds/977
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/995
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/86
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/86
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/995
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/86
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/86
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt-vg/builds/1004
exception: http://buildbot.rust-lang.org/builders/auto-linux-all-opt/builds/997
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/980
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/86
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/86
exception: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/766