sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scons: fix the library path stuff

Browse source
This commit is contained in:
Nathan Binkert 2009-03-07 14:30:52 -08:00
parent 66a85b54e2
commit be2d74a25a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -161,7 +161,8 @@ def compare_versions(v1, v2):
# Set up the base build environment. # Set up the base build environment.
# #
######################################################################## ########################################################################
use_vars = set([ 'AS', 'AR', 'CC', 'CXX', 'HOME', 'PATH', 'RANLIB' ]) use_vars = set([ 'AS', 'AR', 'CC', 'CXX', 'HOME', 'LD_LIBRARY_PATH', 'PATH',
'RANLIB' ])
use_env = {} use_env = {}
for key,val in os.environ.iteritems(): for key,val in os.environ.iteritems():
@ -550,7 +551,7 @@ py_includes = [ py_general_include ]
if py_platform_include != py_general_include: if py_platform_include != py_general_include:
py_includes.append(py_platform_include) py_includes.append(py_platform_include)
py_lib_path = [] py_lib_path = [ py_getvar('LIBDIR') ]
# add the prefix/lib/pythonX.Y/config dir, but only if there is no # add the prefix/lib/pythonX.Y/config dir, but only if there is no
# shared library in prefix/lib/. # shared library in prefix/lib/.
if not py_getvar('Py_ENABLE_SHARED'): if not py_getvar('Py_ENABLE_SHARED'):
@ -564,7 +565,6 @@ py_libs.append('-l' + py_version)
env.Append(CPPPATH=py_includes) env.Append(CPPPATH=py_includes)
env.Append(LIBPATH=py_lib_path) env.Append(LIBPATH=py_lib_path)
#env.Append(LIBS=py_libs)
# verify that this stuff works # verify that this stuff works
if not conf.CheckHeader('Python.h', '<>'): if not conf.CheckHeader('Python.h', '<>'):