View | Details | Raw Unified | Return to bug 226545 | Differences between
and this patch

Collapse All | Expand All

(-)gem5/files/patch-SConstruct (-4 / +15 lines)
Lines 1-6 Link Here
1
--- SConstruct.orig	2015-04-21 15:32:43 UTC
1
--- SConstruct.orig	2015-04-21 11:32:43.000000000 -0400
2
+++ SConstruct
2
+++ SConstruct	2018-03-11 21:17:31.106873000 -0400
3
@@ -534,6 +534,9 @@ Export('MakeAction')
3
@@ -534,6 +534,9 @@
4
 main['LTO_CCFLAGS'] = []
4
 main['LTO_CCFLAGS'] = []
5
 main['LTO_LDFLAGS'] = []
5
 main['LTO_LDFLAGS'] = []
6
 
6
 
Lines 10-16 Link Here
10
 # According to the readme, tcmalloc works best if the compiler doesn't
10
 # According to the readme, tcmalloc works best if the compiler doesn't
11
 # assume that we're using the builtin malloc and friends. These flags
11
 # assume that we're using the builtin malloc and friends. These flags
12
 # are compiler-specific, so we need to set them after we detect which
12
 # are compiler-specific, so we need to set them after we detect which
13
@@ -785,13 +788,8 @@ if main['GCC'] and compareVersions(gcc_v
13
@@ -785,13 +788,8 @@
14
 swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS')
14
 swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS')
15
 main.Append(SWIGFLAGS=swig_flags)
15
 main.Append(SWIGFLAGS=swig_flags)
16
 
16
 
Lines 26-28 Link Here
26
 main['TIMEOUT'] =  timeout_version and \
26
 main['TIMEOUT'] =  timeout_version and \
27
     compareVersions(timeout_version[-1], '8.13') >= 0
27
     compareVersions(timeout_version[-1], '8.13') >= 0
28
 
28
 
29
@@ -922,8 +920,8 @@
30
     # version of python, see above for instructions on how to invoke
31
     # scons with the appropriate PATH set.
32
     #
33
-    # First we check if python2-config exists, else we use python-config
34
-    python_config = readCommand(['which', 'python2-config'],
35
+    # First we check if python2.7-config exists, else we use python-config
36
+    python_config = readCommand(['which', 'python2.7-config'],
37
                                 exception='').strip()
38
     if not os.path.exists(python_config):
39
         python_config = readCommand(['which', 'python-config'],

Return to bug 226545