naaaaaacl

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 73cbf21ca26aab4e3049d955d23ad64a11c587e5..a1b74f41d9de3d78a51161e6fd7c489a171bf0e8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -29,12 +29,12 @@
     'asan%': 0,
 
     # Set this to true when building with Clang.
-    'clang%': 0,
+    'nacl_clang%': 0,
 
     'conditions': [
       ['OS=="mac"', {
         # On Mac only clang is new enough to build the trusted code.
-        'clang%': 1,
+        'nacl_clang%': 1,
         # The Mac SDK is set for iOS builds and passed through to Mac
         # sub-builds. This allows the Mac sub-build SDK in an iOS build to be
         # overridden from the command line the same way it is for a Mac build.
@@ -263,7 +263,7 @@
         ],
       # TODO(jrg): options for code coverage on Windows
       }],
-      ['clang==1', {
+      ['nacl_clang==1', {
         'cflags': [
           '-Wheader-hygiene',
           # Clang spots more unused functions.
@@ -490,7 +490,7 @@
               '-ffunction-sections',
             ],
             'conditions': [
-              ['clang==1', {
+              ['nacl_clang==1', {
                 'cflags!': [
                   '-fno-ident',
                 ],
@@ -534,9 +534,9 @@
           'conditions': [
             ['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'},
                                  {'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'}],
-            ['clang==1', {
-              'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
-              'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
+            ['nacl_clang==1', {
+              'CC': '$(SOURCE_ROOT)/<(nacl_clang_dir)/clang',
+              'LDPLUSPLUS': '$(SOURCE_ROOT)/<(nacl_clang_dir)/clang++',
               'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
               'WARNING_CFLAGS': [
                 '-Wheader-hygiene',
@@ -566,9 +566,9 @@
           ],
         },
         'conditions': [
-          ['clang==1', {
+          ['nacl_clang==1', {
             'variables': {
-              'clang_dir':
+              'nacl_clang_dir':
                 '<(DEPTH)/third_party/llvm-build/Release+Asserts/bin',
             },
           }],
@@ -813,7 +813,7 @@
         },
       },
     }],
-    ['clang==1 and nacl_standalone==1', {
+    ['nacl_clang==1 and nacl_standalone==1', {
       'make_global_settings': [
         ['CC', 'third_party/llvm-build/Release+Asserts/bin/clang'],
         ['CXX', 'third_party/llvm-build/Release+Asserts/bin/clang++'],