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

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

Issue 1390383002: GN: Refactor Linux Clang toolchain definitions, plumb use_gold for toolchain_args() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « 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 2e249386695c8ef4e6eabd632d0dc93ce6862b90..7bd9cbc1bdbc19c240bbfa78f146c4c2c8b8d896 100644
--- a/build/toolchain/linux/BUILD.gn
+++ b/build/toolchain/linux/BUILD.gn
@@ -5,22 +5,10 @@
import("//build/config/sysroot.gni")
import("//build/toolchain/gcc_toolchain.gni")
-gcc_toolchain("clang_arm") {
- prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
- root_build_dir)
- cc = "$prefix/clang"
- cxx = "$prefix/clang++"
-
- toolprefix = "arm-linux-gnueabihf-"
- readelf = "${toolprefix}readelf"
- ar = "${toolprefix}ar"
- ld = cxx
- readelf = "${toolprefix}readelf"
- nm = "${toolprefix}nm"
-
+clang_toolchain("clang_arm") {
toolchain_cpu = "arm"
toolchain_os = "linux"
- is_clang = true
+ toolprefix = "arm-linux-gnueabihf-"
}
gcc_toolchain("arm") {
@@ -39,19 +27,9 @@ gcc_toolchain("arm") {
is_clang = false
}
-gcc_toolchain("clang_x86") {
- prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
- root_build_dir)
- cc = "$prefix/clang"
- cxx = "$prefix/clang++"
- readelf = "readelf"
- nm = "nm"
- ar = "ar"
- ld = cxx
-
+clang_toolchain("clang_x86") {
toolchain_cpu = "x86"
toolchain_os = "linux"
- is_clang = true
}
gcc_toolchain("x86") {
@@ -68,20 +46,9 @@ gcc_toolchain("x86") {
is_clang = false
}
-gcc_toolchain("clang_x64") {
- prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
- root_build_dir)
- cc = "$prefix/clang"
- cxx = "$prefix/clang++"
-
- readelf = "readelf"
- nm = "nm"
- ar = "ar"
- ld = cxx
-
+clang_toolchain("clang_x64") {
toolchain_cpu = "x64"
toolchain_os = "linux"
- is_clang = true
}
gcc_toolchain("x64") {
« no previous file with comments | « build/toolchain/gcc_toolchain.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698