commit 1b8e48c22b6d0ae9d9c65eb35f84ff01d77d0b43
author Michael Spang <spang@google.com> Sat Jan 23 00:15:41 2021 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Jan 23 00:45:05 2021 +0000
tree 0fb5c184b97634625016d3404f68df5291234b9e
parent 6a106368c226dd76611e633717b01d5e76120d38

Revert "pw_toolchain: Fix long command lines on Windows"

This reverts commit b931c8367ce21ddb1d2255cb38f7869ccab44f1a.

Reason for revert: duplicate change

Original change's description:
> pw_toolchain: Fix long command lines on Windows
>
> Link commands can easily exceed command line length limits on Windows:
>
>   ninja: fatal: CreateProcess: The parameter is incorrect.
>    (is the command line too long?)
>
> Use the response file to avoid these limits.
>
> Bug: 289
> Change-Id: Id3e8f81462fa28da06f95ee50f8e61ed67b9ecc2
> Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/30200
> Reviewed-by: Alexei Frolov <frolv@google.com>
> Commit-Queue: Michael Spang <spang@google.com>

TBR=frolv@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 289
Change-Id: I38b207de779f86d07eb6c880ee115a026990e7f9
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/30601
Commit-Queue: Michael Spang <spang@google.com>
Reviewed-by: Michael Spang <spang@google.com>

pw_toolchain/generate_toolchain.gni

diff --git a/pw_toolchain/generate_toolchain.gni b/pw_toolchain/generate_toolchain.gni
index 3d539c0..988d5a8 100644
--- a/pw_toolchain/generate_toolchain.gni
+++ b/pw_toolchain/generate_toolchain.gni
@@ -200,13 +200,11 @@
 
       assert(defined(invoker.ar), "toolchain is missing 'ar'")
       tool("alink") {
-        rspfile = "{{output}}.rsp"
-        rspfile_content = "{{inputs}}"
         if (host_os == "win") {
-          command = "${invoker.ar} rcs {{output}} @\"$rspfile\""
+          command = "${invoker.ar} rcs {{output}} {{inputs}}"
         } else {
           command =
-              "rm -f {{output}} && ${invoker.ar} rcs {{output}} @\"$rspfile\""
+              "rm -f {{output}} && ${invoker.ar} rcs {{output}} {{inputs}}"
         }
         description = "ar {{target_output_name}}{{output_extension}}"
         outputs =
@@ -220,15 +218,11 @@
 
       _link_outfile =
           "{{output_dir}}/{{target_output_name}}{{output_extension}}"
-      _link_rspfile = _link_outfile + ".rsp"
-
       _link_mapfile = "{{output_dir}}/{{target_output_name}}.map"
-      _link_command = string_join(" ",
-                                  [
-                                    invoker.cxx,
-                                    "@\"$_link_rspfile\"",
-                                  ])
-      _link_flags = [ "{{ldflags}}" ]
+      _link_flags = [
+        invoker.cxx,
+        "{{ldflags}}",
+      ]
 
       if (toolchain_os == "mac" || toolchain_os == "ios") {
         _link_flags += [
@@ -278,12 +272,10 @@
       }
       _link_flags += [ "-o $_link_outfile" ]
 
-      _link_rspfile_content = string_join(" ", _link_flags)
+      _link_command = string_join(" ", _link_flags)
 
       tool("link") {
         command = _link_command
-        rspfile = _link_rspfile
-        rspfile_content = _link_rspfile_content
         description = "ld $_link_outfile"
         outputs = [ _link_outfile ]
         default_output_dir = "{{target_out_dir}}/bin"
@@ -299,8 +291,6 @@
 
       tool("solink") {
         command = _link_command + " -shared"
-        rspfile = _link_rspfile
-        rspfile_content = _link_rspfile_content
         description = "ld -shared $_link_outfile"
         outputs = [ _link_outfile ]
         default_output_dir = "{{target_out_dir}}/lib"