diff options
| author | Florian Weimer <fweimer@redhat.com> | 2023-02-02 15:58:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-02 16:58:16 +0200 |
| commit | 023ff42f9853632b94e1fff0e99f0b85ae110ebe (patch) | |
| tree | d84e26ae48e68587acb48c8f59039401b397b2a1 /deps | |
| parent | ffb691f6f1b0f176b1f03c474f1dfd854ee6bf78 (diff) | |
| download | redis-023ff42f9853632b94e1fff0e99f0b85ae110ebe.tar.gz | |
deps/jemalloc: Do not force building in gnu99 mode (#11583)
Previously, jemalloc was explicitly configured to build in `gnu99` mode. As a result, `<stdatomic.h>` was presumed to be unavailable and never used.
This commit removes explicit build flags configuration and lets `autoconf` determine the supported build flags. In addition, we also no longer build C++ jemalloc code.
Co-authored-by: Yossi Gottlieb <yossigo@gmail.com>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/deps/Makefile b/deps/Makefile index c0dc71120..c1796941b 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -97,8 +97,8 @@ lua: .make-prerequisites .PHONY: lua -JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS) -JEMALLOC_LDFLAGS= $(LDFLAGS) +JEMALLOC_CFLAGS=$(CFLAGS) +JEMALLOC_LDFLAGS=$(LDFLAGS) ifneq ($(DEB_HOST_GNU_TYPE),) JEMALLOC_CONFIGURE_OPTS += --host=$(DEB_HOST_GNU_TYPE) @@ -106,7 +106,7 @@ endif jemalloc: .make-prerequisites @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) - cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS) - cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a + cd jemalloc && ./configure --disable-cxx --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS) + cd jemalloc && $(MAKE) lib/libjemalloc.a .PHONY: jemalloc |