From 3f68ac6df3df52ccebbf5b4477f5bcd9b87377ec Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Wed, 26 Apr 2017 06:26:09 -0400 Subject: [PATCH] Fix bad compiler flag checks from bad merge. --- AMBuildScript | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/AMBuildScript b/AMBuildScript index 2c0ab615..a572edf0 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -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':