35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 88da6b19ecd00747769663e913aba5e9569c489d Mon Sep 17 00:00:00 2001
|
|
From: Venture Research <tech@ventureresearch.com>
|
|
Date: Wed, 6 Feb 2013 20:51:02 -0600
|
|
Subject: [PATCH] hack to force use of libc malloc
|
|
|
|
Hack to force libc usage as it seems the option to pass it in has been
|
|
removed in favor of magic.
|
|
|
|
Note that this of course doesn't allow tcmalloc and jemalloc, however
|
|
jemalloc wasn't building correctly.
|
|
|
|
Signed-off-by: Venture Research <tech@ventureresearch.com>
|
|
|
|
Update to work with 4.0.8
|
|
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
|
|
|
---
|
|
src/Makefile | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
index 2a0d74d..ddabd44 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -13,7 +13,8 @@
|
|
# Just use 'make dep', but this is only needed by developers.
|
|
|
|
release_hdr := $(shell sh -c './mkreleasehdr.sh')
|
|
-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
|
+# use fake uname option to force use of generic libc
|
|
+uname_S := "USE_LIBC_MALLOC"
|
|
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
|
|
OPTIMIZATION?=-O2
|
|
DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
|