Don't rely on shell splitting; explicitly make these multiple arguments

One step towards #5147.

PiperOrigin-RevId: 199281558

1 files changed, 260 insertions, 130 deletions

diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl
index 36b30aa215..a6c42ec898 100644
--- a/tools/osx/crosstool/CROSSTOOL.tpl
+++ b/tools/osx/crosstool/CROSSTOOL.tpl
@@ -903,7 +903,8 @@ toolchain {
       action: "assemble"
       action: "preprocess-assemble"
       flag_group {
-        flag: "-isysroot %{sdk_dir}"
+        flag: "-isysroot"
+        flag: "%{sdk_dir}"
       }
     }
   }
@@ -1060,7 +1061,8 @@ toolchain {
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
-        flag: "-framework Foundation"
+        flag: "-framework"
+        flag: "Foundation"
       }
     }
   }
@@ -1070,7 +1072,8 @@ toolchain {
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
-        flag: "-framework Cocoa"
+        flag: "-framework"
+        flag: "Cocoa"
       }
     }
   }
@@ -1478,11 +1481,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -1490,13 +1495,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -1545,11 +1553,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -1557,13 +1567,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -2551,7 +2564,8 @@ toolchain {
       action: "assemble"
       action: "preprocess-assemble"
       flag_group {
-        flag: "-isysroot %{sdk_dir}"
+        flag: "-isysroot"
+        flag: "%{sdk_dir}"
       }
     }
   }
@@ -2709,8 +2723,10 @@ toolchain {
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
-        flag: "-framework Foundation"
-        flag: "-framework UIKit"
+        flag: "-framework"
+        flag: "Foundation"
+        flag: "-framework"
+        flag: "UIKit"
       }
     }
   }
@@ -3133,11 +3149,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -3145,13 +3163,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -3200,11 +3221,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -3212,13 +3235,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -4206,7 +4232,8 @@ toolchain {
       action: "assemble"
       action: "preprocess-assemble"
       flag_group {
-        flag: "-isysroot %{sdk_dir}"
+        flag: "-isysroot"
+        flag: "%{sdk_dir}"
         flag: "-F%{sdk_framework_dir}"
         flag: "-F%{platform_developer_framework_dir}"
       }
@@ -4366,8 +4393,10 @@ toolchain {
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
-        flag: "-framework Foundation"
-        flag: "-framework UIKit"
+        flag: "-framework"
+        flag: "Foundation"
+        flag: "-framework"
+        flag: "UIKit"
       }
     }
   }
@@ -4790,11 +4819,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -4802,13 +4833,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -4857,11 +4891,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -4869,13 +4905,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -5864,7 +5903,8 @@ toolchain {
       action: "assemble"
       action: "preprocess-assemble"
       flag_group {
-        flag: "-isysroot %{sdk_dir}"
+        flag: "-isysroot"
+        flag: "%{sdk_dir}"
       }
     }
   }
@@ -6031,8 +6071,10 @@ toolchain {
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
-        flag: "-framework Foundation"
-        flag: "-framework UIKit"
+        flag: "-framework"
+        flag: "Foundation"
+        flag: "-framework"
+        flag: "UIKit"
       }
     }
   }
@@ -6474,11 +6516,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -6486,13 +6530,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -6541,11 +6588,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -6553,13 +6602,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -7550,7 +7602,8 @@ toolchain {
       action: "assemble"
       action: "preprocess-assemble"
       flag_group {
-        flag: "-isysroot %{sdk_dir}"
+        flag: "-isysroot"
+        flag: "%{sdk_dir}"
       }
     }
   }
@@ -7708,8 +7761,10 @@ toolchain {
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
-        flag: "-framework Foundation"
-        flag: "-framework UIKit"
+        flag: "-framework"
+        flag: "Foundation"
+        flag: "-framework"
+        flag: "UIKit"
       }
     }
   }
@@ -8132,11 +8187,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -8144,13 +8201,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -8199,11 +8259,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -8211,13 +8273,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -9205,7 +9270,8 @@ toolchain {
       action: "assemble"
       action: "preprocess-assemble"
       flag_group {
-        flag: "-isysroot %{sdk_dir}"
+        flag: "-isysroot"
+        flag: "%{sdk_dir}"
       }
     }
   }
@@ -9363,8 +9429,10 @@ toolchain {
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
-        flag: "-framework Foundation"
-        flag: "-framework UIKit"
+        flag: "-framework"
+        flag: "Foundation"
+        flag: "-framework"
+        flag: "UIKit"
       }
     }
   }
@@ -9775,11 +9843,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -9787,13 +9857,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -9842,11 +9915,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -9854,13 +9929,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -10848,7 +10926,8 @@ toolchain {
       action: "assemble"
       action: "preprocess-assemble"
       flag_group {
-        flag: "-isysroot %{sdk_dir}"
+        flag: "-isysroot"
+        flag: "%{sdk_dir}"
         flag: "-F%{sdk_framework_dir}"
         flag: "-F%{platform_developer_framework_dir}"
       }
@@ -11008,8 +11087,10 @@ toolchain {
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
-        flag: "-framework Foundation"
-        flag: "-framework UIKit"
+        flag: "-framework"
+        flag: "Foundation"
+        flag: "-framework"
+        flag: "UIKit"
       }
     }
   }
@@ -11420,11 +11501,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -11432,13 +11515,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -11487,11 +11573,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -11499,13 +11587,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -12494,7 +12585,8 @@ toolchain {
       action: "assemble"
       action: "preprocess-assemble"
       flag_group {
-        flag: "-isysroot %{sdk_dir}"
+        flag: "-isysroot"
+        flag: "%{sdk_dir}"
       }
     }
   }
@@ -12661,8 +12753,10 @@ toolchain {
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
-        flag: "-framework Foundation"
-        flag: "-framework UIKit"
+        flag: "-framework"
+        flag: "Foundation"
+        flag: "-framework"
+        flag: "UIKit"
       }
     }
   }
@@ -13092,11 +13186,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -13104,13 +13200,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -13159,11 +13258,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -13171,13 +13272,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -14168,7 +14272,8 @@ toolchain {
       action: "assemble"
       action: "preprocess-assemble"
       flag_group {
-        flag: "-isysroot %{sdk_dir}"
+        flag: "-isysroot"
+        flag: "%{sdk_dir}"
       }
     }
   }
@@ -14326,8 +14431,10 @@ toolchain {
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
-        flag: "-framework Foundation"
-        flag: "-framework UIKit"
+        flag: "-framework"
+        flag: "Foundation"
+        flag: "-framework"
+        flag: "UIKit"
       }
     }
   }
@@ -14738,11 +14845,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -14750,13 +14859,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -14805,11 +14917,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -14817,13 +14931,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -15812,7 +15929,8 @@ toolchain {
       action: "assemble"
       action: "preprocess-assemble"
       flag_group {
-        flag: "-isysroot %{sdk_dir}"
+        flag: "-isysroot"
+        flag: "%{sdk_dir}"
       }
     }
   }
@@ -15970,8 +16088,10 @@ toolchain {
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
-        flag: "-framework Foundation"
-        flag: "-framework UIKit"
+        flag: "-framework"
+        flag: "Foundation"
+        flag: "-framework"
+        flag: "UIKit"
       }
     }
   }
@@ -16382,11 +16502,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -16394,13 +16516,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {
@@ -16449,11 +16574,13 @@ toolchain {
         flag: "-ObjC"
       }
       flag_group {
-        flag: "-framework %{framework_names}"
+        flag: "-framework"
+        flag: "%{framework_names}"
         iterate_over: "framework_names"
       }
       flag_group {
-        flag: "-weak_framework %{weak_framework_names}"
+        flag: "-weak_framework"
+        flag: "%{weak_framework_names}"
         iterate_over: "weak_framework_names"
       }
       flag_group {
@@ -16461,13 +16588,16 @@ toolchain {
         iterate_over: "library_names"
       }
       flag_group {
-        flag: "-filelist %{filelist}"
+        flag: "-filelist"
+        flag: "%{filelist}"
       }
       flag_group {
-        flag: "-o %{linked_binary}"
+        flag: "-o"
+        flag: "%{linked_binary}"
       }
       flag_group {
-        flag: "-force_load %{force_load_exec_paths}"
+        flag: "-force_load"
+        flag: "%{force_load_exec_paths}"
         iterate_over: "force_load_exec_paths"
       }
       flag_group {