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"