changeset 8f374fd9a348 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=8f374fd9a348
description:
scons: fix the library path stuff
diffstat:
1 file changed, 3 insertions(+), 3 deletions(-)
SConstruct | 6 +++---
diffs (30 lines):
diff -r 7d75f1a525db -r 8f374fd9a348 SConstruct
--- a/SConstruct Sat Mar 07 14:30:52 2009 -0800
+++ b/SConstruct Sat Mar 07 14:30:52 2009 -0800
@@ -161,7 +161,8 @@
# 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 @@
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 @@
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', '<>'):
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
