diff options
| author | Sylvestre Ledru <sledru@mozilla.com> | 2017-12-07 22:09:38 +0100 |
|---|---|---|
| committer | Sylvestre Ledru <sledru@mozilla.com> | 2017-12-07 22:09:38 +0100 |
| commit | e84c09e36b264b9d5e3928a86482d45b868fb101 (patch) | |
| tree | ed1832b8e2587c5e411199b6edb9d4908a23038e | |
| parent | 056deb876afb1b5034dee24948ef4357c883b6ed (diff) | |
| download | nss-hg-e84c09e36b264b9d5e3928a86482d45b868fb101.tar.gz | |
Bug 1394734 - Replace CONFIG['CLANG*'] by CONFIG['CC_TYPE'] r=glandium
MozReview-Commit-ID: HbF5oT5HW6f
| -rw-r--r-- | lib/mozpkix/test/gtest/moz.build | 4 | ||||
| -rw-r--r-- | lib/mozpkix/warnings.mozbuild | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/mozpkix/test/gtest/moz.build b/lib/mozpkix/test/gtest/moz.build index bac34ef3f..00fa0f9c8 100644 --- a/lib/mozpkix/test/gtest/moz.build +++ b/lib/mozpkix/test/gtest/moz.build @@ -39,7 +39,7 @@ include('../../warnings.mozbuild') # GTest uses a variadic macro in a questionable way and it doesn't seem to be # possible to selectively disable just that error when -pedantic-errors is set. -if CONFIG['CC_TYPE'] in ('clang', 'gcc') and not CONFIG['CLANG_CXX']: +if CONFIG['CC_TYPE'] in ('clang', 'gcc') and CONFIG['CC_TYPE'] != 'clang': CXXFLAGS.remove('-pedantic-errors') # These warnings are disabled in order to minimize the amount of boilerplate @@ -50,7 +50,7 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'): '-Wno-error=shadow', '-Wno-old-style-cast', ] - if CONFIG['CLANG_CXX']: + if CONFIG['CC_TYPE'] == 'clang': CXXFLAGS += [ '-Wno-exit-time-destructors', '-Wno-global-constructors', diff --git a/lib/mozpkix/warnings.mozbuild b/lib/mozpkix/warnings.mozbuild index ec98ae88c..338f71fd9 100644 --- a/lib/mozpkix/warnings.mozbuild +++ b/lib/mozpkix/warnings.mozbuild @@ -1,4 +1,4 @@ -if CONFIG['CLANG_CXX']: +if CONFIG['CC_TYPE'] == 'clang': CXXFLAGS += [ '-Weverything', |