summaryrefslogtreecommitdiff
path: root/ext/gzstream
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2009-04-21 17:17:15 -0700
committerNathan Binkert <nate@binkert.org>2009-04-21 17:17:15 -0700
commit56e5509bfd4e670c032ccff4c7d68dbe7493eadd (patch)
tree86f6cad462524fedc0c9d85e591834d8d46b59d3 /ext/gzstream
parent4d001e43da6da2972172c352153e745238860021 (diff)
downloadgem5-56e5509bfd4e670c032ccff4c7d68dbe7493eadd.tar.xz
scons: Fix two problems with the way that the library path is generated.
1) -L is automatically added, so don't do it ourselves 2) prepend the paths for gzstream and libelf so they are certain to come first. The problem is that python might add /usr/lib to the path and the user might have a locally installed version of libelf installed.
Diffstat (limited to 'ext/gzstream')
-rw-r--r--ext/gzstream/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/gzstream/SConscript b/ext/gzstream/SConscript
index ec2939b8b..ef591229e 100644
--- a/ext/gzstream/SConscript
+++ b/ext/gzstream/SConscript
@@ -32,7 +32,7 @@ Import('env')
env.Library('gzstream', [File('gzstream.cc')])
-env.Append(CPPPATH=Dir('.'))
+env.Prepend(CPPPATH=Dir('.'))
env.Append(LIBS=['gzstream'])
-env.Append(LIBPATH=[Dir('.')])
+env.Prepend(LIBPATH=[Dir('.')])