averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "build: bootstrap SwiftPM with forked and not host clang"

Browse Source
This commit is contained in:
Alastair Houghton
2023-07-17 20:01:06 +01:00
committed by GitHub
parent e89de6e7e0
commit a3dd8d6777
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
utils/swift_build_support/swift_build_support/products/swiftpm.py
View File

@@ -48,7 +48,6 @@ class SwiftPM(product.Product):
toolchain_path = self.native_toolchain_path(host_target) toolchain_path = self.native_toolchain_path(host_target)
swiftc = os.path.join(toolchain_path, "bin", "swiftc") 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 # FIXME: We require llbuild build directory in order to build. Is
# there a better way to get this? # there a better way to get this?
@@ -68,7 +67,7 @@ class SwiftPM(product.Product):
helper_cmd += [ helper_cmd += [
"--swiftc-path", swiftc, "--swiftc-path", swiftc,
"--clang-path", clang, "--clang-path", self.toolchain.cc,
"--cmake-path", self.toolchain.cmake, "--cmake-path", self.toolchain.cmake,
"--ninja-path", self.toolchain.ninja, "--ninja-path", self.toolchain.ninja,
"--build-dir", self.build_dir, "--build-dir", self.build_dir,