Remove toolchain definition to build with gcc on Mac.

build/toolchain/mac/BUILD.gn

Index: build/toolchain/mac/BUILD.gn
diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn
index a58c3b4e67266d1eb7e8952b7b1350aebbd8f2a8..3fa1a3abfd904f2c4af3afa7b0f2bfd18ea0fb7a 100644
--- a/build/toolchain/mac/BUILD.gn
+++ b/build/toolchain/mac/BUILD.gn
@@ -27,11 +27,10 @@ if (use_goma) {
   compiler_prefix = ""
 }
 
-if (use_xcode_clang) {
-  _clang_prefix = ""
-} else {
-  _clang_prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin/",
-                              root_build_dir)
+if (!use_xcode_clang) {
+  compiler_prefix = compiler_prefix +
+                    rebase_path("//third_party/llvm-build/Release+Asserts/bin/",
+                                root_build_dir)
 }
 
 if (current_toolchain == default_toolchain) {
@@ -361,44 +360,26 @@ template("mac_toolchain") {
 mac_toolchain("clang_arm") {
   toolchain_cpu = "arm"
   toolchain_os = "mac"
-  cc = "${compiler_prefix}${_clang_prefix}clang"
-  cxx = "${compiler_prefix}${_clang_prefix}clang++"
+  cc = "${compiler_prefix}clang"

[sdefresne, 2016/06/21 20:33:18]

I noticed that cc/cxx/ld/is_clang are always the same in all invocation of the
mac_toolchain template. Should I instead inline them in the template? It would
avoid duplication but would make harder to support building with another
compiler on Mac/iOS (though it is currently unlikely to happen).

WDYT? Do you want me to update my CL?

[Dirk Pranke, 2016/06/21 21:24:50]

It probably would be a good idea to inline them in the template just to make
things a bit clearer, but I won't be upset if you don't do that now.

+  cxx = "${compiler_prefix}clang++"
   ld = cxx
   is_clang = true
 }
 
-mac_toolchain("arm") {
-  toolchain_cpu = "arm"
-  toolchain_os = "mac"
-  cc = "${compiler_prefix}gcc"
-  cxx = "${compiler_prefix}g++"
-  ld = cxx
-  is_clang = false
-}
-
 mac_toolchain("clang_x64") {
   toolchain_cpu = "x64"
   toolchain_os = "mac"
-  cc = "${compiler_prefix}${_clang_prefix}clang"
-  cxx = "${compiler_prefix}${_clang_prefix}clang++"
+  cc = "${compiler_prefix}clang"
+  cxx = "${compiler_prefix}clang++"
   ld = cxx
   is_clang = true
 }
 
-mac_toolchain("x64") {
-  toolchain_cpu = "x64"
-  toolchain_os = "mac"
-  cc = "${compiler_prefix}gcc"
-  cxx = "${compiler_prefix}g++"
-  ld = cxx
-  is_clang = false
-}
-
 mac_toolchain("ios_clang_arm") {
   toolchain_cpu = "arm"
   toolchain_os = "mac"
-  cc = "${compiler_prefix}${_clang_prefix}clang"
-  cxx = "${compiler_prefix}${_clang_prefix}clang++"
+  cc = "${compiler_prefix}clang"
+  cxx = "${compiler_prefix}clang++"
   ld = cxx
   is_clang = true
 }
@@ -406,8 +387,8 @@ mac_toolchain("ios_clang_arm") {
 mac_toolchain("ios_clang_arm64") {
   toolchain_cpu = "arm64"
   toolchain_os = "mac"
-  cc = "${compiler_prefix}${_clang_prefix}clang"
-  cxx = "${compiler_prefix}${_clang_prefix}clang++"
+  cc = "${compiler_prefix}clang"
+  cxx = "${compiler_prefix}clang++"
   ld = cxx
   is_clang = true
 }
@@ -415,8 +396,8 @@ mac_toolchain("ios_clang_arm64") {
 mac_toolchain("ios_clang_x86") {
   toolchain_cpu = "x86"
   toolchain_os = "mac"
-  cc = "${compiler_prefix}${_clang_prefix}clang"
-  cxx = "${compiler_prefix}${_clang_prefix}clang++"
+  cc = "${compiler_prefix}clang"
+  cxx = "${compiler_prefix}clang++"
   ld = cxx
   is_clang = true
 }
@@ -424,8 +405,8 @@ mac_toolchain("ios_clang_x86") {
 mac_toolchain("ios_clang_x64") {
   toolchain_cpu = "x64"
   toolchain_os = "mac"
-  cc = "${compiler_prefix}${_clang_prefix}clang"
-  cxx = "${compiler_prefix}${_clang_prefix}clang++"
+  cc = "${compiler_prefix}clang"
+  cxx = "${compiler_prefix}clang++"
   ld = cxx
   is_clang = true
 }