blob: a0f66b845e2ff5bbe29c2745b488653c6e43156c [file] [log] [blame]
Andrew Geisslere34f8962021-04-15 15:53:51 -05001From 1fa047162983d4a7e0576f0837a73a6027a783bd Mon Sep 17 00:00:00 2001
Patrick Williamsb48b7b42016-08-17 15:04:38 -05002From: Venture Research <tech@ventureresearch.com>
3Date: Wed, 6 Feb 2013 20:51:02 -0600
4Subject: [PATCH] hack to force use of libc malloc
5
6Hack to force libc usage as it seems the option to pass it in has been
7removed in favor of magic.
8
Andrew Geisslere34f8962021-04-15 15:53:51 -05009Note that this of course doesn't allow tcmalloc and jemalloc, however
Patrick Williamsb48b7b42016-08-17 15:04:38 -050010jemalloc wasn't building correctly.
11
12Signed-off-by: Venture Research <tech@ventureresearch.com>
13
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080014Update to work with 4.0.8
15Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Patrick Williamsb48b7b42016-08-17 15:04:38 -050016
17---
Andrew Geisslere34f8962021-04-15 15:53:51 -050018 src/Makefile | 3 ++-
19 1 file changed, 2 insertions(+), 1 deletion(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050020
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080021diff --git a/src/Makefile b/src/Makefile
Andrew Geisslere34f8962021-04-15 15:53:51 -050022index ecd6929..c7f43c5 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050023--- a/src/Makefile
24+++ b/src/Makefile
25@@ -13,7 +13,8 @@
26 # Just use 'make dep', but this is only needed by developers.
27
28 release_hdr := $(shell sh -c './mkreleasehdr.sh')
29-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
30+# use fake uname option to force use of generic libc
31+uname_S := "USE_LIBC_MALLOC"
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080032 uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050033 OPTIMIZATION?=-O2
Andrew Geisslere34f8962021-04-15 15:53:51 -050034 DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram