diff options
| author | Nathan Binkert <nate@binkert.org> | 2009-03-07 14:30:52 -0800 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2009-03-07 14:30:52 -0800 |
| commit | be2d74a25afad22f2c6da97aba0a45c492d779e1 (patch) | |
| tree | ca4c2120cb838ae60493b2b94257015b0aac1e24 | |
| parent | 66a85b54e2f59e13b726f05a30bb115f2fb10dbc (diff) | |
| download | gem5-be2d74a25afad22f2c6da97aba0a45c492d779e1.tar.xz | |
scons: fix the library path stuff
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index a0f273aad..533da927c 100644 --- a/SConstruct +++ b/SConstruct @@ -161,7 +161,8 @@ def compare_versions(v1, v2): # 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 = {} for key,val in os.environ.iteritems(): @@ -550,7 +551,7 @@ py_includes = [ py_general_include ] if py_platform_include != py_general_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 # shared library in prefix/lib/. if not py_getvar('Py_ENABLE_SHARED'): @@ -564,7 +565,6 @@ py_libs.append('-l' + py_version) env.Append(CPPPATH=py_includes) env.Append(LIBPATH=py_lib_path) -#env.Append(LIBS=py_libs) # verify that this stuff works if not conf.CheckHeader('Python.h', '<>'): |