Merge pull request #67328 from finagolfin/release/5.8

[5.8][build] Make sure SPM is built with the forked clang, not the host clang

Author: al45tair

utils/swift_build_support/swift_build_support/products/swiftpm.py

@@ -48,6 +48,7 @@ def run_bootstrap_script(self, action, host_target, additional_params=[]):
 
         toolchain_path = self.native_toolchain_path(host_target)
         swiftc = os.path.join(toolchain_path, "bin", "swiftc")
+        clang = os.path.join(toolchain_path, "bin", "clang")
 
         # FIXME: We require llbuild build directory in order to build. Is
         # there a better way to get this?
@@ -67,7 +68,7 @@ def run_bootstrap_script(self, action, host_target, additional_params=[]):
 
         helper_cmd += [
             "--swiftc-path", swiftc,
-            "--clang-path", self.toolchain.cc,
+            "--clang-path", clang,
             "--cmake-path", self.toolchain.cmake,
             "--ninja-path", self.toolchain.ninja,
             "--build-dir", self.build_dir,