Bug 1394734 - Replace CONFIG['GNU_C*'] by CONFIG['CC_TYPE'] r=glandium

MozReview-Commit-ID: 7duJk2gSd4m

3 files changed, 4 insertions, 4 deletions

diff --git a/lib/mozpkix/moz.build b/lib/mozpkix/moz.build
index e32cc2c99..6dfb6c8c6 100644
--- a/lib/mozpkix/moz.build
+++ b/lib/mozpkix/moz.build
@@ -35,7 +35,7 @@ Library('mozillapkix')
 
 FINAL_LIBRARY = 'xul'
 
-if CONFIG['GNU_CXX']:
+if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += ['-Wno-error=shadow']
 
 if CONFIG['_MSC_VER']:
diff --git a/lib/mozpkix/test/gtest/moz.build b/lib/mozpkix/test/gtest/moz.build
index 76c086f8c..1a2ac76cd 100644
--- a/lib/mozpkix/test/gtest/moz.build
+++ b/lib/mozpkix/test/gtest/moz.build
@@ -39,13 +39,13 @@ 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['GNU_CXX'] and not CONFIG['CLANG_CXX']:
+if CONFIG['CC_TYPE'] in ('clang', 'gcc') and not CONFIG['CLANG_CXX']:
   CXXFLAGS.remove('-pedantic-errors')
 
 # These warnings are disabled in order to minimize the amount of boilerplate
 # required to implement tests, and/or because they originate in the GTest
 # framework in a way we cannot otherwise work around.
-if CONFIG['GNU_CXX']:
+if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
   CXXFLAGS += [
     '-Wno-error=shadow',
     '-Wno-old-style-cast',
diff --git a/lib/mozpkix/test/lib/moz.build b/lib/mozpkix/test/lib/moz.build
index c99aedf3a..bc9bf50b9 100644
--- a/lib/mozpkix/test/lib/moz.build
+++ b/lib/mozpkix/test/lib/moz.build
@@ -35,5 +35,5 @@ LOCAL_INCLUDES += [
 
 FINAL_LIBRARY = 'xul-gtest'
 
-if CONFIG['GNU_CXX']:
+if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += ['-Wno-error=shadow']