From ae6ff02d1be440faa6e4e14296b04fbb02d341fb Mon Sep 17 00:00:00 2001 From: Butta Date: Mon, 27 Mar 2023 00:33:29 +0530 Subject: [PATCH] Revert "Revert "build: bootstrap SwiftPM with forked and not host clang"" This reverts a3dd8d677, which should be fixed by apple/swift-package-manager#6721. --- .../swift_build_support/products/swiftpm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/swift_build_support/swift_build_support/products/swiftpm.py b/utils/swift_build_support/swift_build_support/products/swiftpm.py index 42a2ff914b4e6..6c698d22b58bd 100644 --- a/utils/swift_build_support/swift_build_support/products/swiftpm.py +++ b/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,