summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2014-04-13 10:07:55 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2014-04-13 10:07:55 -0400
commitc970c28af17f7e38a1c72ecfed78d14e271588da (patch)
treef55580b1539eaf77af0189d520ad0b05f9d9f140
parentca90a54476a45823c627ed2658211b5ca6dc4997 (diff)
downloadgem5-c970c28af17f7e38a1c72ecfed78d14e271588da.tar.xz
scons: Fix python-config parsing by adding strip()
This patch fixes an issue with the way the python-config path is parsed, as it caused issues on systems where a newline ended up being included in the path.
-rwxr-xr-xSConstruct3
1 files changed, 2 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index ff36fbccd..a1aad32d4 100755
--- a/SConstruct
+++ b/SConstruct
@@ -876,7 +876,8 @@ if main['M5_BUILD_CACHE']:
# 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='')
+ python_config = readCommand(['which', 'python-config'],
+ exception='').strip()
py_includes = readCommand([python_config, '--includes'],
exception='').split()
# Strip the -I from the include folders before adding them to the