From e28e6246fc106569909124ada78603ae1507a972 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Mon, 18 Mar 2013 11:24:56 +0100 Subject: [PATCH] scons: Try to use 'tcmalloc' before 'tcmalloc_minimal' tcmalloc_minimal doesn't support the heap checker on Debian, while tcmalloc does. Instead of always linking with tcmalloc_minimal, if it exists, we first check for tcmalloc and then use tcmalloc_minimal as a fallback. --- SConstruct | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index b175cb491..6354bf0ca 100755 --- a/SConstruct +++ b/SConstruct @@ -925,7 +925,9 @@ have_posix_clock = \ conf.CheckLibWithHeader('rt', 'time.h', 'C', 'clock_nanosleep(0,0,NULL,NULL);') -if conf.CheckLib('tcmalloc_minimal'): +if conf.CheckLib('tcmalloc'): + main.Append(CCFLAGS=main['TCMALLOC_CCFLAGS']) +elif conf.CheckLib('tcmalloc_minimal'): main.Append(CCFLAGS=main['TCMALLOC_CCFLAGS']) else: print termcap.Yellow + termcap.Bold + \ -- 2.30.2