Skip to content

Commit

Permalink
Revert "Turn off jemalloc"
Browse files Browse the repository at this point in the history 
This reverts commit 371a316.

Closes #7217
  • Loading branch information
@thestinger
thestinger committed Aug 17, 2013
1 parent 7503396 commit 0dceabd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mk/rt.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ rt/$(1)/stage$(2)/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$(1)_$(2))
$$(Q)$(AR_$(1)) rcs $$@ $$<

rt/$(1)/stage$(2)/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS) \
$$(RUNTIME_DEF_$(1)_$(2)) $$(LIBUV_LIB_$(1)_$(2))
$$(RUNTIME_DEF_$(1)_$(2)) $$(LIBUV_LIB_$(1)_$(2)) $$(JEMALLOC_LIB_$(1)_$(2))
@$$(call E, link: $$@)
$$(Q)$$(call CFG_LINK_CXX_$(1),$$@, $$(RUNTIME_OBJS_$(1)_$(2)) \
$$(CFG_GCCISH_POST_LIB_FLAGS_$(1)) $$(LIBUV_LIB_$(1)_$(2)) \
$$(JEMALLOC_LIB_$(1)_$(2)) $$(CFG_GCCISH_POST_LIB_FLAGS_$(1)) $$(LIBUV_LIB_$(1)_$(2)) \
$$(CFG_LIBUV_LINK_FLAGS_$(1)),$$(RUNTIME_DEF_$(1)_$(2)),$$(CFG_RUNTIME_$(1)))

# FIXME: For some reason libuv's makefiles can't figure out the
Expand Down

4 comments on commit 0dceabd

@bors
Copy link
Contributor

@bors bors commented on 0dceabd Aug 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at https://github.com/thestinger/rust/commit/0dceabda7f1049fd70d38cf61c80dd5148fdca4e

@bors
Copy link
Contributor

@bors bors commented on 0dceabd Aug 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging thestinger/rust/jemalloc = 0dceabd into auto

@bors
Copy link
Contributor

@bors bors commented on 0dceabd Aug 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thestinger/rust/jemalloc = 0dceabd merged ok, testing candidate = c934f759

@bors
Copy link
Contributor

@bors bors commented on 0dceabd Aug 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Please sign in to comment.