clang_toolchain: don't strip host binaries
This fixes a regression from eac39857a0aed25e5790b63cb1835b61efc9bba3 that
enabled stripping of all host binaries and libraries that was previously not
done.
Change-Id: I76f686e752aa468ebd23a0679f4c1cedf73417e1
diff --git a/toolchain/BUILD.gn b/toolchain/BUILD.gn
index bedc385..239832e 100644
--- a/toolchain/BUILD.gn
+++ b/toolchain/BUILD.gn
@@ -6,6 +6,7 @@
import("//build/config/fuchsia/config.gni")
clang_toolchain("host_${host_cpu}") {
+ use_strip = false
toolchain_cpu = host_cpu
toolchain_os = host_os
}
diff --git a/toolchain/clang_toolchain.gni b/toolchain/clang_toolchain.gni
index 96b12df..b052222 100644
--- a/toolchain/clang_toolchain.gni
+++ b/toolchain/clang_toolchain.gni
@@ -5,11 +5,6 @@
import("//build/toolchain/ccache.gni")
import("//build/toolchain/goma.gni")
-declare_args() {
- # Run the strip tool on libraries and binaries
- use_strip = true
-}
-
if (host_cpu == "arm64") {
_clang_cpu = "aarch64"
} else if (host_cpu == "x64") {
@@ -92,6 +87,8 @@
cxx = compiler_prefix + "${prefix}/clang++"
ar = "${prefix}/llvm-ar"
ld = cxx
+
+ forward_variables_from(invoker, ["use_strip"])
if (use_strip) {
clang_strip = "${prefix}/strip"
strip = clang_strip
diff --git a/toolchain/fuchsia/BUILD.gn b/toolchain/fuchsia/BUILD.gn
index d698a5c..3af4656 100644
--- a/toolchain/fuchsia/BUILD.gn
+++ b/toolchain/fuchsia/BUILD.gn
@@ -7,6 +7,7 @@
template("fuchsia_toolchain") {
clang_toolchain(target_name) {
+ use_strip = true
forward_variables_from(invoker, "*")
toolchain_cpu = target_cpu
