summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2014-06-10 17:44:39 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2014-06-10 17:44:39 -0400
commitfdb965f5c17d8866a63c206e1975460544d8eda9 (patch)
treef03744aa14f085cf4c6abd71d392118e633bf639 /src
parent4a98b0cd5985fabf7b4138f0ef1e19023d3e028c (diff)
downloadgem5-fdb965f5c17d8866a63c206e1975460544d8eda9.tar.xz
scons: Bump the compiler version to gcc 4.6 and clang 3.0
This patch bumps the supported version of gcc from 4.4 to 4.6, and clang from 2.9 to 3.0. This enables, amongst other things, range-based for loops, lambda expressions, etc. The STL implementation shipping with 4.6 also has a full functional implementation of unique_ptr and shared_ptr.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/SConscript6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/SConscript b/src/SConscript
index 287c388ba..f5b082819 100755
--- a/src/SConscript
+++ b/src/SConscript
@@ -925,10 +925,8 @@ def makeEnv(env, label, objsfx, strip = False, **kwargs):
# warnings about uninitialized variables and missing field
# initializers.
swig_env.Append(CCFLAGS=['-Wno-uninitialized',
- '-Wno-missing-field-initializers'])
-
- if compareVersions(env['GCC_VERSION'], '4.6') >= 0:
- swig_env.Append(CCFLAGS='-Wno-unused-but-set-variable')
+ '-Wno-missing-field-initializers',
+ '-Wno-unused-but-set-variable'])
# If gcc supports it, also warn for deletion of derived
# classes with non-virtual desctructors. For gcc >= 4.7 we