From 618fdb8e77ae0fa7443b7bdfe5e0404762964178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20B=C3=B6ckenkamp?= Date: Wed, 31 Jul 2013 15:39:05 +0200 Subject: [PATCH] gem5 buildsys: compiler flag fixed due to newer gcc version (Debian 7.1 comes with gcc 4.7.2) However, we are faking a gcc v4.4.5 but the gem5 build system only adds the '-Wno-unused-but-set-variable' flag in case of a gcc >= v4.6. Now, this flag will always be appended. (Older gcc versions should ignore the flag or emit a warning but will continue to run.) Change-Id: I7021e08019951375c7e8b56d0f875191f904971d --- simulators/gem5/src/SConscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/simulators/gem5/src/SConscript b/simulators/gem5/src/SConscript index 24d31fcc..73d61bc3 100755 --- a/simulators/gem5/src/SConscript +++ b/simulators/gem5/src/SConscript @@ -854,8 +854,9 @@ def makeEnv(label, objsfx, strip = False, **kwargs): swig_env.Append(CCFLAGS='-Wno-sign-compare') swig_env.Append(CCFLAGS='-Wno-parentheses') swig_env.Append(CCFLAGS='-Wno-unused-label') - if compareVersions(env['GCC_VERSION'], '4.6') >= 0: - swig_env.Append(CCFLAGS='-Wno-unused-but-set-variable') + # DanceOS (We are faking gcc 4.4.5--see above--but the underlying gcc might be newer.) + # if compareVersions(env['GCC_VERSION'], '4.6'): + swig_env.Append(CCFLAGS='-Wno-unused-but-set-variable') if env['CLANG']: swig_env.Append(CCFLAGS=['-Wno-unused-label'])