Merge pull request #28 from brightray/xcode-clang

Use Xcode's clang, not Chromium's

chromiumcontent.gypi

@@ -1,5 +1,7 @@
 {
   'variables': {
+    # We're not using Chromium's clang, so we can't use their plugins either.
+    'clang_use_chrome_plugins': 0,
     'conditions': [
       ['OS=="win"', {
         # Chrome turns this off for component builds, and we need to too. Leaving
@@ -83,6 +85,12 @@
         'ExceptionHandling': '1',  # /EHsc
       },
     },
+    'xcode_settings': {
+      'WARNING_CFLAGS!': [
+        # Xcode 5 doesn't support -Wno-deprecated-register.
+        '-Wno-deprecated-register',
+      ],
+    },
     'target_conditions': [
       ['_target_name=="base"', {
         # This file doesn't work inside a shared library, and won't compile at

script/update

@@ -114,6 +114,13 @@ def run_gyp():
     ensure_nacl_disabled()
     os.environ['GYP_GENERATORS'] = 'ninja'
 
+    if sys.platform == 'darwin':
+        # Use Xcode's own clang instead of Chromium's. This matches what embedding
+        # applications will use, reducing the risk of bugs due to version
+        # mismatches.
+        os.environ['CC_target'] = 'clang'
+        os.environ['CXX_target'] = 'clang++'
+
     os.chdir(SOURCE_ROOT)
     REL_SRC_DIR = os.path.relpath(SRC_DIR)
     REL_CHROMIUMCONTENT_DIR = os.path.relpath(CHROMIUMCONTENT_DIR)