summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas@sandberg.pp.se>2013-03-18 10:44:34 +0100
committerAndreas Sandberg <andreas@sandberg.pp.se>2013-03-18 10:44:34 +0100
commit9e9a47cb9ae69b081206372179b069e6150e7891 (patch)
treeb32e7f26e3b2f7a06bf8c6dd3c4861e6a02a83fd
parent3e3475138bbc1c4f1836d861a6b38e6d288a6720 (diff)
downloadgem5-9e9a47cb9ae69b081206372179b069e6150e7891.tar.xz
scons: Don't explicitly add tcmalloc_minimal to LIBS
SCons automatically adds a library to LIBS if conf.CheckLib succeeds, so there is no need to explicitly add the library.
-rwxr-xr-xSConstruct8
1 files changed, 1 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct
index 15e49fba4..2be0a6767 100755
--- a/SConstruct
+++ b/SConstruct
@@ -914,10 +914,7 @@ have_posix_clock = \
conf.CheckLibWithHeader('rt', 'time.h', 'C',
'clock_nanosleep(0,0,NULL,NULL);')
-if conf.CheckLib('tcmalloc_minimal'):
- have_tcmalloc = True
-else:
- have_tcmalloc = False
+if not conf.CheckLib('tcmalloc_minimal'):
print termcap.Yellow + termcap.Bold + \
"You can get a 12% performance improvement by installing tcmalloc "\
"(libgoogle-perftools-dev package on Ubuntu or RedHat)." + \
@@ -1199,9 +1196,6 @@ for variant_path in variant_paths:
if env['USE_SSE2']:
env.Append(CCFLAGS=['-msse2'])
- if have_tcmalloc:
- env.Append(LIBS=['tcmalloc_minimal'])
-
# The src/SConscript file sets up the build rules in 'env' according
# to the configured variables. It returns a list of environments,
# one for each variant build (debug, opt, etc.)