diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-08-17 19:46:52 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-08-17 19:54:23 -0400 |
| commit | 0dceabda7f1049fd70d38cf61c80dd5148fdca4e (patch) | |
| tree | 792b6ae3a7792f28179394f15bb53c6a3eaa75fc | |
| parent | 7503396070a8d69040e9998faf667c29c6a6f2cb (diff) | |
| download | rust-0dceabda7f1049fd70d38cf61c80dd5148fdca4e.tar.gz rust-0dceabda7f1049fd70d38cf61c80dd5148fdca4e.zip | |
Revert "Turn off jemalloc"
This reverts commit 371a316ec93a977f9dcd305b5f532cd394fa6885. Closes #7217
| -rw-r--r-- | mk/rt.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index 0aeeec3b487..75701a03184 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -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 |