Work on Clang for pure GN build.

build/toolchain/linux/BUILD.gn

 # Copyright 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.
 
-import("../clang.gni")
-import("../goma.gni")
-import("../gcc_toolchain.gni")
 import("//build/config/sysroot.gni")
+import("//build/toolchain/clang.gni")
+import("//build/toolchain/gcc_toolchain.gni")
+import("//build/toolchain/goma.gni")
 
 if (is_gyp) {
   # Set the compilers for GYP to use. This logic is only relevant to GYP where
   # there is "a" target compiler. In native GN builds, we have separate
   # compilers for the toolchains below, any or all of which could be active in
   # any given build.
   if (is_clang) {
     # Set the GYP header for all toolchains when running under Clang.
     make_global_settings = make_clang_global_settings
   } else {
@@ skipping 21 matching lines @@
       "'conditions':" +
       "[['\"<(GENERATOR)\"==\"ninja\"', { 'make_global_settings': [" +
       make_global_settings +
       make_goma_global_settings +
       "]}]],"
   } else {
     gyp_header = "'make_global_settings': [" + make_global_settings + "],"
   }
 }
 
-# ARM --------------------------------------------------------------------------
-
 gcc_toolchain("arm") {

[Nico, 2014/01/29 18:45:48]

clang can target arm too fwiw (the same clang binary can code for various
architectures, the compiler binary - target code mapping isn't 1-1 like with
gcc)

   cc = "arm-linux-gnueabi-gcc"
   cxx = "arm-linux-gnueabi-g++"
   ar = "arm-linux-gnueabi-ar"
   ld = cxx
 
   toolchain_cpu_arch = "arm"
   toolchain_os = "linux"
 }
 
-# 32-bit -----------------------------------------------------------------------
+gcc_toolchain("x86") {
+  if (is_clang) {
+    if (use_clang_type_profiler) {
+      prefix = rebase_path("//third_party/llvm-allocated-type/Linux_ia32/bin",
+                           ".", root_build_dir)
+    } else {
+      prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
+                           ".", root_build_dir)
+    }
+    cc = "$prefix/clang"
+    cxx = "$prefix/clang++"

[Nico, 2014/01/29 18:45:48]

Will this harmonize with use_goma=1?

[brettw, 2014/01/30 00:24:03]

No, I haven't looked at Goma yet.

+  } else {
+    cc = "gcc"
+    cxx = "g++"
+  }
 
-gcc_toolchain("x86") {
-  cc = "gcc"
-  cxx = "g++"
   ar = "ar"
   ld = cxx
 
   toolchain_cpu_arch = "x86"
   toolchain_os = "linux"
 }
 
 gcc_toolchain("x64") {
-  cc = "gcc"
-  cxx = "g++"
+  if (is_clang) {
+    if (use_clang_type_profiler) {
+      prefix = rebase_path("//third_party/llvm-allocated-type/Linux_x64/bin",
+                           ".", root_build_dir)
+    } else {
+      prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
+                           ".", root_build_dir)
+    }
+    cc = "$prefix/clang"
+    cxx = "$prefix/clang++"
+  } else {
+    cc = "gcc"
+    cxx = "g++"
+  }
+
   ar = "ar"
   ld = cxx
 
   toolchain_cpu_arch = "x64"
   toolchain_os = "linux"
 }
 
-# MIPS -----------------------------------------------------------------------
-
 gcc_toolchain("mipsel") {
   cc = "mipsel-linux-gnu-gcc"
   cxx = "mipsel-linux-gnu-g++"
   ar = "mipsel-linux-gnu-ar"
   ld = cxx
 
   toolchain_cpu_arch = "mipsel"
   toolchain_os = "linux"
 }