From 56e5509bfd4e670c032ccff4c7d68dbe7493eadd Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Tue, 21 Apr 2009 17:17:15 -0700 Subject: 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. --- ext/gzstream/SConscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/gzstream/SConscript') 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('.')]) -- cgit v1.2.3