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.
This commit is contained in:
@@ -119,7 +119,7 @@ m4env.M4(target=File('libelf_msize.c'),
|
||||
# into either m5 or the library
|
||||
m4env.Library('elf', [m4env.SharedObject(f) for f in elf_files])
|
||||
|
||||
env.Append(CPPPATH=Dir('.'))
|
||||
env.Prepend(CPPPATH=Dir('.'))
|
||||
env.Append(LIBS=['elf'])
|
||||
env.Append(LIBPATH=[Dir('.')])
|
||||
env.Prepend(LIBPATH=[Dir('.')])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user