Merge pull request #62446 from drexin/wip-103080745

[Build] Pass missing build parameters

Author: drexin

utils/swift_build_support/swift_build_support/build_script_invocation.py

@@ -176,6 +176,11 @@ def convert_to_impl_arguments(self):
                         product_name, ' '.join(cmake_opts))
                 ]
 
+        if args.build_toolchain_only:
+            impl_args += [
+                "--build-toolchain-only=1"
+            ]
+
         if args.build_stdlib_deployment_targets:
             impl_args += [
                 "--build-stdlib-deployment-targets", " ".join(

utils/swift_build_support/swift_build_support/products/cmake_product.py

@@ -91,13 +91,15 @@ def build_with_cmake(self, build_targets, build_type, build_args,
                 shell.call(["env"] + cmake_build + cmake_opts)
 
             shell.call(
-                ["env"] + cmake_build + cmake_opts + ["--"] + build_args + build_targets
+                ["env"] + cmake_build + cmake_opts + ["--"] + build_args
+                        + _cmake.build_args() + build_targets
             )
 
     def test_with_cmake(self, executable_target, results_targets,
                         build_type, build_args, test_env=None):
         assert self.toolchain.cmake is not None
         cmake_build = []
+        _cmake = cmake.CMake(self.args, self.toolchain)
 
         if self.toolchain.distcc_pump:
             cmake_build.append(self.toolchain.distcc_pump)
@@ -110,7 +112,7 @@ def test_with_cmake(self, executable_target, results_targets,
 
         cmake_args = [self.toolchain.cmake, "--build", self.build_dir,
                       "--config", build_type, "--"]
-        cmake_build.extend(cmake_args + build_args)
+        cmake_build.extend(cmake_args + build_args + _cmake.build_args())
 
         def target_flag(target):
             if self.args.cmake_generator == "Xcode":

validation-test/BuildSystem/skip_build_xcode.test

@@ -11,4 +11,4 @@
 #
 # CHECK: --- Building llvm ---
 # CHECK: env {{.+}}/cmake --build {{.+}}/Xcode-ReleaseAssert/llvm-macosx-{{.+}} --config Release --target ZERO_CHECK{{$}}
-# CHECK-NEXT: env {{.+}}/cmake --build {{.+}}/Xcode-ReleaseAssert/llvm-macosx-{{.+}} --config Release --target ZERO_CHECK -- -target llvm-tblgen -target clang-resource-headers -target intrinsics_gen -target clang-tablegen-targets -target FileCheck -target not -target llvm-nm -target llvm-size{{$}}
+# CHECK-NEXT: env {{.+}}/cmake --build {{.+}}/Xcode-ReleaseAssert/llvm-macosx-{{.+}} --config Release --target ZERO_CHECK -- {{.*}}-target llvm-tblgen -target clang-resource-headers -target intrinsics_gen -target clang-tablegen-targets -target FileCheck -target not -target llvm-nm -target llvm-size{{$}}