librustc: Don't try to perform the magical

[rust.git] / mk / rt.mk

diff --git a/mk/rt.mk b/mk/rt.mk
index 7fc82ef6269d80587a8b5dacf338597b44697399..49b9d2aad8d2906026fe17f0468d4092e3e11a4d 100644 (file)
--- a/mk/rt.mk
+++ b/mk/rt.mk
@@ -306,6 +306,8 @@ $$(JEMALLOC_LOCAL_$(1)): $$(JEMALLOC_DEPS) $$(MKFILE_DEPS)
                EXTRA_CFLAGS="$$(CFG_CFLAGS_$(1)) $$(CFG_JEMALLOC_CFLAGS_$(1)) -g1"
        $$(Q)$$(MAKE) -C "$$(JEMALLOC_BUILD_DIR_$(1))" build_lib_static
 
+ifeq ($$(CFG_DISABLE_JEMALLOC),)
+RUSTFLAGS_alloc := --cfg jemalloc
 ifeq ($(1),$$(CFG_BUILD))
 ifneq ($$(CFG_JEMALLOC_ROOT),)
 $$(JEMALLOC_LIB_$(1)): $$(CFG_JEMALLOC_ROOT)/libjemalloc_pic.a
@@ -319,6 +321,10 @@ else
 $$(JEMALLOC_LIB_$(1)): $$(JEMALLOC_LOCAL_$(1))
        $$(Q)cp $$< $$@
 endif
+else
+$$(JEMALLOC_LIB_$(1)): $$(MKFILE_DEPS)
+       $$(Q)touch $$@
+endif
 
 ################################################################################
 # compiler-rt