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

MozReview-Commit-ID: 5orfnoude7h

3 files changed, 3 insertions, 3 deletions

diff --git a/lib/mozpkix/moz.build b/lib/mozpkix/moz.build
index 6dfb6c8c6..e97bf3e14 100644
--- a/lib/mozpkix/moz.build
+++ b/lib/mozpkix/moz.build
@@ -38,7 +38,7 @@ FINAL_LIBRARY = 'xul'
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += ['-Wno-error=shadow']
 
-if CONFIG['_MSC_VER']:
+if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
     # This is intended as a temporary hack to support building with VS2015.
     # declaration of '*' hides class member
     CXXFLAGS += ['-wd4458']
diff --git a/lib/mozpkix/test/gtest/moz.build b/lib/mozpkix/test/gtest/moz.build
index 1a2ac76cd..bac34ef3f 100644
--- a/lib/mozpkix/test/gtest/moz.build
+++ b/lib/mozpkix/test/gtest/moz.build
@@ -58,7 +58,7 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
       '-Wno-used-but-marked-unused',
       '-Wno-zero-as-null-pointer-constant',
     ]
-elif CONFIG['_MSC_VER']:
+elif CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
   CXXFLAGS += [
     '-wd4350', # behavior change: 'std::_Wrap_alloc<std::allocator<_Ty>>::...
     '-wd4275', # non dll-interface class used as base for dll-interface class
diff --git a/lib/mozpkix/warnings.mozbuild b/lib/mozpkix/warnings.mozbuild
index 4ddd3a119..ec98ae88c 100644
--- a/lib/mozpkix/warnings.mozbuild
+++ b/lib/mozpkix/warnings.mozbuild
@@ -11,7 +11,7 @@ if CONFIG['CLANG_CXX']:
     '-Wno-shadow', # XXX: Clang's rules are too strict for constructors.
     '-Wno-weak-vtables', # We rely on the linker to merge the duplicate vtables.
   ]
-elif CONFIG['_MSC_VER']:
+elif CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
   CXXFLAGS += [
     '-sdl', # Enable additional security checks based on Microsoft's SDL.