Skip to content

Commit

Permalink
Fix bad compiler flag checks from bad merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
psychonic committed Apr 26, 2017
1 parent 05c7290 commit 3f68ac6
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions AMBuildScript
Expand Up @@ -177,14 +177,13 @@ class MMSConfig(object):
if cxx.family == 'gcc':
cxx.cflags += ['-mfpmath=sse']
if cxx.family == 'clang':
cxx.cxxflags += [
'-Wno-implicit-exception-spec-mismatch',
'-Wno-inconsistent-missing-override',
]
if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
cxx.cxxflags += ['-Wno-deprecated-register']
if cfg.version >= 'clang-3.6':
cfg.cxxflags += ['-Wno-inconsistent-missing-override']
cfg.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
if cfg.version >= 'apple-clang-5.1' or cfg.version >= 'clang-3.4':
cfg.cxxflags += ['-Wno-deprecated-register']
else:
cxx.cxxflags += ['-Wno-deprecated']
cfg.cxxflags += ['-Wno-deprecated']

elif cxx.like('msvc'):
if builder.options.debug == '1':
Expand Down

0 comments on commit 3f68ac6

Please sign in to comment.