summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2012-11-01 15:36:37 +0100
committerantirez <antirez@gmail.com>2012-11-01 15:37:38 +0100
commit4917a6a8b310e968a172aed245de797e6f0897d7 (patch)
tree17d87fc81e04c11774b1326bec46e12c14c280ce
parent47ff443b53d5ac8fafc024d4afa328ef83bc8722 (diff)
downloadredis-4917a6a8b310e968a172aed245de797e6f0897d7.tar.gz
32 bit build fixed on Linux.
It failed because of the way jemalloc was compiled (without passing the right flags to make, but just to configure). Now the same set of flags are also passed to the make command, fixing the issue. This fixes issue #744
-rw-r--r--deps/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/Makefile b/deps/Makefile
index 7cd9c0f64..d58ee5681 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -73,6 +73,6 @@ JEMALLOC_LDFLAGS= $(LDFLAGS)
jemalloc: .make-prerequisites
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
cd jemalloc && ./configure --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
- cd jemalloc && $(MAKE) lib/libjemalloc.a
+ cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
.PHONY: jemalloc