From 45289978bf5cd7a8223c8de30bfcb3b9af00fec4 Mon Sep 17 00:00:00 2001
From: Zachary Anderson <zra@google.com>
Date: Fri, 5 Jan 2018 14:02:29 -0800
Subject: [PATCH] Try to fix build determinism problem

Change-Id: If88be33a79a26107d297b87da08e3c7abde4e7cb
Reviewed-on: https://dart-review.googlesource.com/32665
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Zach Anderson <zra@google.com>
---
 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 b21a7d1b27c..075948d1086 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 rcs {{output}} @$rspfile"
+      command = "rm -f {{output}} && $ar rcsD {{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-all $outfile $stripped_outfile"
+            "${strip} --strip-sections $outfile $stripped_outfile"
         command += " && " + strip_command
       }
       if (defined(invoker.postlink)) {