commit 33dfba1d9c06723c4decf2b38705c3fa7ef4f198
author David Srbecky <dsrbecky@google.com> Sat Mar 20 14:46:15 2021 +0000
committer David Srbecky <dsrbecky@google.com> Sat Mar 20 14:46:15 2021 +0000
tree be1f97ece253259e48ed6636f380c09eef4d9767
parent ad50ce83497c7d25a5167ea6bdef1f0290b99f58

Revert "[strip.sh] Move remaining GNU binutils usage to llvm binutils"

This reverts commit ad50ce83497c7d25a5167ea6bdef1f0290b99f58.

Bug: 183237575
Reason for revert: Breaks stack unwinding

Change-Id: I256dc77525687fb3e670355587b1eac72158b274

cc/builder.go

diff --git a/cc/builder.go b/cc/builder.go
index c70cd9b..9cd78d5 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -132,7 +132,7 @@
 		blueprint.RuleParams{
 			Depfile:     "${out}.d",
 			Deps:        blueprint.DepsGCC,
-			Command:     "XZ=$xzCmd CLANG_BIN=${config.ClangBin} $stripPath ${args} -i ${in} -o ${out} -d ${out}.d",
+			Command:     "CROSS_COMPILE=$crossCompile XZ=$xzCmd CLANG_BIN=${config.ClangBin} $stripPath ${args} -i ${in} -o ${out} -d ${out}.d",
 			CommandDeps: []string{"$stripPath", "$xzCmd"},
 			Pool:        darwinStripPool,
 		},