From cb115acf3c18cb2b8d5ca3186b29a3267626720d Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Sat, 6 Jan 2018 07:49:11 +0000 Subject: [PATCH] Revert "Try to fix build determinism problem" This reverts commit 45289978bf5cd7a8223c8de30bfcb3b9af00fec4. Reason for revert: Reverting to remove merge conflict in toolchain roll revert. Original change's description: > Try to fix build determinism problem > > Change-Id: If88be33a79a26107d297b87da08e3c7abde4e7cb > Reviewed-on: https://dart-review.googlesource.com/32665 > Reviewed-by: Ryan Macnak > Commit-Queue: Zach Anderson TBR=sortie@google.com,rmacnak@google.com,zra@google.com Change-Id: I37c23f11e87d2020d53068e457655a70a6349516 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/32801 Reviewed-by: Zach Anderson Commit-Queue: Zach Anderson --- build/toolchain/gcc_toolchain.gni | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni index 075948d1086..b21a7d1b27c 100644 --- a/build/toolchain/gcc_toolchain.gni +++ b/build/toolchain/gcc_toolchain.gni @@ -129,7 +129,7 @@ template("gcc_toolchain") { tool("alink") { rspfile = "{{output}}.rsp" - command = "rm -f {{output}} && $ar rcsD {{output}} @$rspfile" + command = "rm -f {{output}} && $ar rcs {{output}} @$rspfile" description = "AR {{output}}" rspfile_content = "{{inputs}}" outputs = [ @@ -209,7 +209,7 @@ template("gcc_toolchain") { } else if (defined(invoker.llvm_objcopy)) { strip = invoker.llvm_objcopy strip_command = - "${strip} --strip-sections $outfile $stripped_outfile" + "${strip} --strip-all $outfile $stripped_outfile" command += " && " + strip_command } if (defined(invoker.postlink)) {