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

Unified Diff: build/toolchain/gcc_toolchain.gni

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/config/compiler/BUILD.gn ('k') | build/toolchain/linux/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/gcc_toolchain.gni
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
index 042a836feaa2887bdea85e37a7b9bf22c3baf8d4..48099ea2414265a81c4316c3bf93939fd942ea0d 100644
--- a/build/toolchain/gcc_toolchain.gni
+++ b/build/toolchain/gcc_toolchain.gni
@@ -81,6 +81,9 @@ concurrent_links = exec_script("get_concurrent_links.py", [], "value")
# - use_goma
# Override the global use_goma setting, useful to opt-out of goma in a
# particular toolchain by setting use_gome = false in it.
+# - use_gold
+# Override the global use_gold setting, useful if the particular
+# toolchain has a custom link step that is not actually using Gold.
template("gcc_toolchain") {
toolchain(target_name) {
assert(defined(invoker.cc), "gcc_toolchain() must specify a \"cc\" value")
@@ -344,6 +347,7 @@ template("gcc_toolchain") {
"is_clang",
"is_component_build",
"is_nacl_glibc",
+ "use_gold",
])
if (defined(invoker.clear_sanitizers) && invoker.clear_sanitizers) {
@@ -360,3 +364,42 @@ template("gcc_toolchain") {
forward_variables_from(invoker, [ "deps" ])
}
}
+
+# This is a shorthand for gcc_toolchain instances based on the
+# Chromium-built version of Clang. Only the toolchain_cpu and
+# toolchain_os variables need to be specified by the invoker, and
+# optionally toolprefix if it's a cross-compile case. Note that for
+# a cross-compile case this toolchain requires a config to pass the
+# appropriate -target option, or else it will actually just be doing
+# a native compile. The invoker can optionally override use_gold too.
+template("clang_toolchain") {
+ assert(defined(invoker.toolchain_cpu),
+ "clang_toolchain() must specify a \"toolchain_cpu\"")
+ assert(defined(invoker.toolchain_os),
+ "clang_toolchain() must specify a \"toolchain_os\"")
+ if (defined(invoker.toolprefix)) {
+ toolprefix = invoker.toolprefix
+ } else {
+ toolprefix = ""
+ }
+
+ gcc_toolchain(target_name) {
+ prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
+ root_build_dir)
+ cc = "$prefix/clang"
+ cxx = "$prefix/clang++"
+ ld = cxx
+ is_clang = true
+
+ readelf = "${toolprefix}readelf"
+ ar = "${toolprefix}ar"
+ nm = "${toolprefix}nm"
+
+ forward_variables_from(invoker,
+ [
+ "toolchain_cpu",
+ "toolchain_os",
+ "use_gold",
+ ])
+ }
+}
« no previous file with comments | « build/config/compiler/BUILD.gn ('k') | build/toolchain/linux/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698