GCC: Guard some gcc flags so they're used when available and needed.
This commit is contained in:
parent
472645d62a
commit
2ee59cee1b
2 changed files with 5 additions and 3 deletions
|
@ -487,6 +487,7 @@ if main['GCC']:
|
|||
# Note CCVERSION doesn't work here because it is run with the CC
|
||||
# before we override it from the command line
|
||||
gcc_version = readCommand([main['CXX'], '-dumpversion'], exception=False)
|
||||
main['GCC_VERSION'] = gcc_version
|
||||
if not compareVersions(gcc_version, '4.4.1') or \
|
||||
not compareVersions(gcc_version, '4.4.2'):
|
||||
print 'Info: Tree vectorizer in GCC 4.4.1 & 4.4.2 is buggy, disabling.'
|
||||
|
|
|
@ -51,7 +51,7 @@ Export('env')
|
|||
|
||||
build_env = [(opt, env[opt]) for opt in export_vars]
|
||||
|
||||
from m5.util import code_formatter
|
||||
from m5.util import code_formatter, compareVersions
|
||||
|
||||
########################################################################
|
||||
# Code for adding source files of various types
|
||||
|
@ -851,8 +851,9 @@ def makeEnv(label, objsfx, strip = False, **kwargs):
|
|||
swig_env.Append(CCFLAGS='-Wno-uninitialized')
|
||||
swig_env.Append(CCFLAGS='-Wno-sign-compare')
|
||||
swig_env.Append(CCFLAGS='-Wno-parentheses')
|
||||
swig_env.Append(CCFLAGS='-Wno-unused-label')
|
||||
swig_env.Append(CCFLAGS='-Wno-unused-but-set-variable')
|
||||
if compareVersions(env['GCC_VERSION'], '4.6.0') != -1:
|
||||
swig_env.Append(CCFLAGS='-Wno-unused-label')
|
||||
swig_env.Append(CCFLAGS='-Wno-unused-but-set-variable')
|
||||
|
||||
werror_env = new_env.Clone()
|
||||
werror_env.Append(CCFLAGS='-Werror')
|
||||
|
|
Loading…
Reference in a new issue