[iOS/GN] Allow compilation with system clang.

build/toolchain/mac/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # TODO(brettw) Use "gcc_toolchain.gni" like the Linux toolchains. This requires
 # some enhancements since the commands on Mac are slightly different than on
 # Linux.
 
 import("../goma.gni")
 import("//build/config/ios/ios_sdk.gni")
@@ skipping 14 matching lines @@
 
 if (current_toolchain == default_toolchain) {
   # Reduce the number of tasks using the copy_bundle_data and compile_xcassets
   # tools as they can cause lots of I/O contention when invoking ninja with a
   # large number of parallel jobs (e.g. when using distributed build like goma).
   pool("bundle_pool") {
     depth = concurrent_links
   }
 }
 
+if (use_system_clang) {
+  _clang_prefix = ""
+} else {
+  _clang_prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin/",
+                              root_build_dir)
+}
+
 # This will copy the gyp-mac-tool to the build directory. We pass in the source
 # file of the mac tool.
 gyp_mac_tool_source =
     rebase_path("//tools/gyp/pylib/gyp/mac_tool.py", root_build_dir)
 exec_script("setup_toolchain.py", [ gyp_mac_tool_source ])
 
 # When implementing tools using Python scripts, a TOOL_VERSION=N env
 # variable is placed in front of the command. The N should be incremented
 # whenever the script is changed, so that the build system rebuilds all
 # edges that utilize the script. Ideally this should be changed to use
@@ skipping 298 matching lines @@
       if (defined(invoker.is_clang)) {
         is_clang = invoker.is_clang
       }
     }
   }
 }
 
 mac_toolchain("clang_arm") {
   toolchain_cpu = "arm"
   toolchain_os = "mac"
-  prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
-                       root_build_dir)
-  cc = "${goma_prefix}$prefix/clang"
-  cxx = "${goma_prefix}$prefix/clang++"
+  cc = "${goma_prefix}${_clang_prefix}clang"
+  cxx = "${goma_prefix}${_clang_prefix}clang++"
   ld = cxx
   is_clang = true
 }
 
+mac_toolchain("arm") {
+  toolchain_cpu = "arm"
+  toolchain_os = "mac"
+  cc = "${goma_prefix}gcc"
+  cxx = "${goma_prefix}g++"
+  ld = cxx
+  is_clang = false
+}
+
+mac_toolchain("clang_x64") {
+  toolchain_cpu = "x64"
+  toolchain_os = "mac"
+  cc = "${goma_prefix}${_clang_prefix}clang"
+  cxx = "${goma_prefix}${_clang_prefix}clang++"
+  ld = cxx
+  is_clang = true
+}
+
+mac_toolchain("x64") {
+  toolchain_cpu = "x64"
+  toolchain_os = "mac"
+  cc = "${goma_prefix}gcc"
+  cxx = "${goma_prefix}g++"
+  ld = cxx
+  is_clang = false
+}

[Dirk Pranke, 2016/06/20 16:31:22]

Where do we use gcc toolchains on the mac? Why add these?

[sdefresne, 2016/06/21 11:31:29]

I didn't add them, I moved the ios ones below this one (it was between "arm" and
"clang_x64"). They were located around line 403-423 in the old file.

I can remove them if you think they are not useful. But I'd prefer to do it in a
followup CL (so that I do not get reverted whole if this breaks someone, though
I don't think it will as last time I tried build failed on Mac with gcc).

+
 mac_toolchain("ios_clang_arm") {
   toolchain_cpu = "arm"
   toolchain_os = "mac"
-
-  # TODO(GYP): We need to support being able to use the version of clang
-  # shipped w/ XCode instead of the one pulled from upstream.
-  prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
-                       root_build_dir)
-  cc = "${goma_prefix}$prefix/clang"
-  cxx = "${goma_prefix}$prefix/clang++"
-  ld = cxx
-  is_clang = true
-}
-
-mac_toolchain("ios_clang_armv7") {
-  toolchain_cpu = "armv7"
-  toolchain_os = "mac"
-
-  # TODO(GYP): We need to support being able to use the version of clang
-  # shipped w/ XCode instead of the one pulled from upstream.
-  prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
-                       root_build_dir)
-  cc = "${goma_prefix}$prefix/clang"
-  cxx = "${goma_prefix}$prefix/clang++"
+  cc = "${goma_prefix}${_clang_prefix}clang"
+  cxx = "${goma_prefix}${_clang_prefix}clang++"
   ld = cxx
   is_clang = true
 }
 
 mac_toolchain("ios_clang_arm64") {
   toolchain_cpu = "arm64"
   toolchain_os = "mac"
-
-  # TODO(GYP): We need to support being able to use the version of clang
-  # shipped w/ XCode instead of the one pulled from upstream.
-  prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
-                       root_build_dir)
-  cc = "${goma_prefix}$prefix/clang"
-  cxx = "${goma_prefix}$prefix/clang++"
+  cc = "${goma_prefix}${_clang_prefix}clang"
+  cxx = "${goma_prefix}${_clang_prefix}clang++"
   ld = cxx
   is_clang = true
 }
 
-mac_toolchain("arm") {
-  toolchain_cpu = "arm"
+mac_toolchain("ios_clang_x86") {
+  toolchain_cpu = "x86"
   toolchain_os = "mac"
-  cc = "${goma_prefix}/gcc"
-  cxx = "${goma_prefix}/g++"
-  ld = cxx
-  is_clang = false
-}
-
-mac_toolchain("clang_x64") {
-  toolchain_cpu = "x64"
-  toolchain_os = "mac"
-  prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
-                       root_build_dir)
-  cc = "${goma_prefix}$prefix/clang"
-  cxx = "${goma_prefix}$prefix/clang++"
+  cc = "${goma_prefix}${_clang_prefix}clang"
+  cxx = "${goma_prefix}${_clang_prefix}clang++"
   ld = cxx
   is_clang = true
 }
 
-mac_toolchain("x64") {
+mac_toolchain("ios_clang_x64") {
   toolchain_cpu = "x64"
   toolchain_os = "mac"
-  cc = "${goma_prefix}/gcc"
-  cxx = "${goma_prefix}/g++"
+  cc = "${goma_prefix}${_clang_prefix}clang"
+  cxx = "${goma_prefix}${_clang_prefix}clang++"
   ld = cxx
-  is_clang = false
+  is_clang = true
 }