diff options
| author | Cody P Schafer <dev@codyps.com> | 2014-11-17 13:10:48 -0500 |
|---|---|---|
| committer | Cody P Schafer <dev@codyps.com> | 2014-11-17 16:41:15 -0500 |
| commit | 600cec1cd819a49f556fa30b0639a2f24e76cf71 (patch) | |
| tree | 67839bc4c7fa78f86028e8ed5ca0fb76e1ad623c | |
| parent | 61e53c94f26af678205fdf8b3fda1e466998a689 (diff) | |
| download | rust-600cec1cd819a49f556fa30b0639a2f24e76cf71.tar.gz rust-600cec1cd819a49f556fa30b0639a2f24e76cf71.zip | |
mk/rt/jemalloc: pass CFG_GCCISH_CFLAGS inside CC instead of passing CFG_CFLAGS in EXTRA_CFLAGS
- CFG_CFLAGS is gone (it was previously only used by jemalloc anyhow). - CFG_JEMALLOC_CFLAGS may contain flags needed for the compiler to function (produce a binary output). - jemalloc's configure runs $(CC) without EXTRA_CFLAGS, and (without this change) will fail if any flags are required for CC to work.
| -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 7204808c30a..a7d6a6e825f 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -177,11 +177,11 @@ $$(JEMALLOC_LOCAL_$(1)): $$(JEMALLOC_DEPS) $$(MKFILE_DEPS) cd "$$(JEMALLOC_BUILD_DIR_$(1))"; "$(S)src/jemalloc/configure" \ $$(JEMALLOC_ARGS_$(1)) --with-jemalloc-prefix=je_ $(CFG_JEMALLOC_FLAGS) \ --build=$$(CFG_GNU_TRIPLE_$(CFG_BUILD)) --host=$$(CFG_GNU_TRIPLE_$(1)) \ - CC="$$(CC_$(1))" \ + CC="$$(CC_$(1)) $$(CFG_JEMALLOC_CFLAGS_$(1))" \ AR="$$(AR_$(1))" \ RANLIB="$$(AR_$(1)) s" \ CPPFLAGS="-I $(S)src/rt/" \ - EXTRA_CFLAGS="$$(CFG_CFLAGS_$(1)) $$(CFG_JEMALLOC_CFLAGS_$(1)) -g1" + EXTRA_CFLAGS="-g1" $$(Q)$$(MAKE) -C "$$(JEMALLOC_BUILD_DIR_$(1))" build_lib_static ifeq ($$(CFG_DISABLE_JEMALLOC),) |