Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Unified Diff: build/toolchain/linux/BUILD.gn

Issue 385823002: Make it possible for Android GN host builds to use Clang. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« build/config/BUILDCONFIG.gn ('K') | « build/toolchain/gcc_toolchain.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/linux/BUILD.gn
diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn
index dd98cb4e0e36e69a868cb937fae508d1f0685089..9789454e30823bf7054ffd9fb823d987d4c87b03 100644
--- a/build/toolchain/linux/BUILD.gn
+++ b/build/toolchain/linux/BUILD.gn
@@ -15,52 +15,69 @@ gcc_toolchain("arm") {
toolchain_cpu_arch = "arm"
toolchain_os = "linux"
+ is_clang = false
}
-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++"
+gcc_toolchain("clang_x86") {
+ if (use_clang_type_profiler) {
+ prefix = rebase_path("//third_party/llvm-allocated-type/Linux_ia32/bin",
+ root_build_dir)
} else {
- cc = "gcc"
- cxx = "g++"
+ prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
+ root_build_dir)
}
+ cc = "$prefix/clang"
+ cxx = "$prefix/clang++"
ar = "ar"
ld = cxx
toolchain_cpu_arch = "x86"
toolchain_os = "linux"
+ is_clang = true
}
-gcc_toolchain("x64") {
- 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++"
+gcc_toolchain("x86") {
+ cc = "gcc"
+ cxx = "g++"
+
+ ar = "ar"
+ ld = cxx
+
+ toolchain_cpu_arch = "x86"
+ toolchain_os = "linux"
+ is_clang = false
+}
+
+gcc_toolchain("clang_x64") {
+ if (use_clang_type_profiler) {
+ prefix = rebase_path("//third_party/llvm-allocated-type/Linux_x64/bin",
+ root_build_dir)
} else {
- cc = "gcc"
- cxx = "g++"
+ prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
+ root_build_dir)
}
+ cc = "$prefix/clang"
+ cxx = "$prefix/clang++"
+
+ ar = "ar"
+ ld = cxx
+
+ toolchain_cpu_arch = "x64"
+ toolchain_os = "linux"
+ is_clang = true
+}
+
+gcc_toolchain("x64") {
+ cc = "gcc"
+ cxx = "g++"
ar = "ar"
ld = cxx
toolchain_cpu_arch = "x64"
toolchain_os = "linux"
+ is_clang = false
}
gcc_toolchain("mipsel") {
@@ -71,4 +88,5 @@ gcc_toolchain("mipsel") {
toolchain_cpu_arch = "mipsel"
toolchain_os = "linux"
+ is_clang = false
}
« build/config/BUILDCONFIG.gn ('K') | « build/toolchain/gcc_toolchain.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698