Bug 1321379 - set cc_is_clang for CLANG_CL also; r=ted.mielczarek
authorNathan Froyd <froydnj@mozilla.com>
Wed, 30 Nov 2016 15:28:06 -0500
changeset 371192 2addff14349eade0d2cc5315f584bf8104eae376
parent 371191 d840edb5b3ec4c3c313af96a2a68408cd00f3e07
child 371193 e0b74d386259e50dce2ea036b23f9d08b166b3e4
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1321379
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1321379 - set cc_is_clang for CLANG_CL also; r=ted.mielczarek MozReview-Commit-ID: DoYRbAJJmnV
security/moz.build
--- a/security/moz.build
+++ b/security/moz.build
@@ -76,17 +76,17 @@ else:
     gyp_vars['use_system_sqlite'] = 1
     gyp_vars['sqlite_libs'] = 'sqlite'
     gyp_vars['nspr_include_dir'] = CONFIG['NSPR_INCLUDE_DIR']
     gyp_vars['nspr_lib_dir'] = CONFIG['NSPR_LIB_DIR']
     # The Python scripts that detect clang need it to be set as CC
     # in the environment, which isn't true here. I don't know that
     # setting that would be harmful, but we already have this information
     # anyway.
-    if CONFIG['CLANG_CXX']:
+    if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
         gyp_vars['cc_is_clang'] = 1
 
     GYP_DIRS += ['nss']
     GYP_DIRS['nss'].input = 'nss/nss.gyp'
     GYP_DIRS['nss'].variables = gyp_vars
 
     sandbox_vars = {
         # NSS explicitly exports its public symbols