Skip to content

Commit 600cec1

Browse files
committed
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.
1 parent 61e53c9 commit 600cec1

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
@@ -177,11 +177,11 @@ $$(JEMALLOC_LOCAL_$(1)): $$(JEMALLOC_DEPS) $$(MKFILE_DEPS)
177177
cd "$$(JEMALLOC_BUILD_DIR_$(1))"; "$(S)src/jemalloc/configure" \
178178
$$(JEMALLOC_ARGS_$(1)) --with-jemalloc-prefix=je_ $(CFG_JEMALLOC_FLAGS) \
179179
--build=$$(CFG_GNU_TRIPLE_$(CFG_BUILD)) --host=$$(CFG_GNU_TRIPLE_$(1)) \
180-
CC="$$(CC_$(1))" \
180+
CC="$$(CC_$(1)) $$(CFG_JEMALLOC_CFLAGS_$(1))" \
181181
AR="$$(AR_$(1))" \
182182
RANLIB="$$(AR_$(1)) s" \
183183
CPPFLAGS="-I $(S)src/rt/" \
184-
EXTRA_CFLAGS="$$(CFG_CFLAGS_$(1)) $$(CFG_JEMALLOC_CFLAGS_$(1)) -g1"
184+
EXTRA_CFLAGS="-g1"
185185
$$(Q)$$(MAKE) -C "$$(JEMALLOC_BUILD_DIR_$(1))" build_lib_static
186186

187187
ifeq ($$(CFG_DISABLE_JEMALLOC),)

0 commit comments

Comments
 (0)