diff options
| -rwxr-xr-x | SConstruct | 7 | ||||
| -rwxr-xr-x | src/SConscript | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index d5f56b22a..6250bdd2f 100755 --- a/SConstruct +++ b/SConstruct @@ -638,7 +638,12 @@ elif main['CLANG']: # is relying on this main.Append(CCFLAGS=['-Wno-tautological-compare', '-Wno-parentheses', - '-Wno-self-assign']) + '-Wno-self-assign', + # Some versions of libstdc++ (4.8?) seem to + # use struct hash and class hash + # interchangeably. + '-Wno-mismatched-tags', + ]) main.Append(TCMALLOC_CCFLAGS=['-fno-builtin']) diff --git a/src/SConscript b/src/SConscript index f5b082819..88fedbfdc 100755 --- a/src/SConscript +++ b/src/SConscript @@ -940,6 +940,14 @@ def makeEnv(env, label, objsfx, strip = False, **kwargs): # with non-virtual destructors new_env.Append(CXXFLAGS=['-Wdelete-non-virtual-dtor']) + swig_env.Append(CCFLAGS=[ + # Some versions of SWIG can return uninitialized values + '-Wno-sometimes-uninitialized', + # Register storage is requested in a lot of places in + # SWIG-generated code. + '-Wno-deprecated-register', + ]) + werror_env = new_env.Clone() werror_env.Append(CCFLAGS='-Werror') |