Skip to content

Commit 0dceabd

Browse files
committedAug 17, 2013
Revert "Turn off jemalloc"
This reverts commit 371a316. Closes #7217
1 parent 7503396 commit 0dceabd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎mk/rt.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ rt/$(1)/stage$(2)/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$(1)_$(2))
149149
$$(Q)$(AR_$(1)) rcs $$@ $$<
150150

151151
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))
153153
@$$(call E, link: $$@)
154154
$$(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)) \
156156
$$(CFG_LIBUV_LINK_FLAGS_$(1)),$$(RUNTIME_DEF_$(1)_$(2)),$$(CFG_RUNTIME_$(1)))
157157

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

4 commit comments

Comments
 (4)

bors commented on Aug 19, 2013

@bors
Collaborator

bors commented on Aug 19, 2013

@bors
Collaborator

merging thestinger/rust/jemalloc = 0dceabd into auto

bors commented on Aug 19, 2013

@bors
Collaborator

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

bors commented on Aug 19, 2013

@bors
Collaborator
Please sign in to comment.