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

scons: compile on systems where python2 and python3 co-exist

Browse source 
Compile gem5 on systems where python2 and python3 co-exists without any
changes in path. python2-config is chosen over python-config if it exists.

Committed by: Nilay Vaish <nilay@cs.wisc.edu>
This commit is contained in:
Stian Hvatum 2014-04-10 13:40:15 -05:00
parent 02b51afb7e
commit 698c4c792d
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SConstruct
View file

@ -872,7 +872,12 @@ if main['M5_BUILD_CACHE']:
# we add them explicitly below. If you want to link in an alternate # we add them explicitly below. If you want to link in an alternate
# version of python, see above for instructions on how to invoke # version of python, see above for instructions on how to invoke
# scons with the appropriate PATH set. # scons with the appropriate PATH set.
py_includes = readCommand(['python-config', '--includes'], #
# First we check if python2-config exists, else we use python-config
python_config = readCommand(['which', 'python2-config'], exception='').strip()
if not os.path.exists(python_config):
python_config = readCommand(['which', 'python-config'], exception='')
py_includes = readCommand([python_config, '--includes'],
exception='').split() exception='').split()
# Strip the -I from the include folders before adding them to the # Strip the -I from the include folders before adding them to the
# CPPPATH # CPPPATH
@ -880,7 +885,7 @@ main.Append(CPPPATH=map(lambda inc: inc[2:], py_includes))
# Read the linker flags and split them into libraries and other link # Read the linker flags and split them into libraries and other link
# flags. The libraries are added later through the call the CheckLib. # flags. The libraries are added later through the call the CheckLib.
py_ld_flags = readCommand(['python-config', '--ldflags'], exception='').split() py_ld_flags = readCommand([python_config, '--ldflags'], exception='').split()
py_libs = [] py_libs = []
for lib in py_ld_flags: for lib in py_ld_flags:
if not lib.startswith('-l'): if not lib.startswith('-l'):