From 9c1af18d0e3a81a8fa3ec0f9303e4d820e9d6e09 Mon Sep 17 00:00:00 2001 From: Butta Date: Mon, 12 Dec 2022 00:41:04 +0530 Subject: [PATCH] Install llvm-ar in the toolchain A recent SPM change made it mandatory for there to be an archiver in the toolchain/PATH, apple/swift-package-manager#5761, so make sure llvm-ar is bundled in the toolchain. --- utils/build-presets.ini | 4 ++-- utils/build_swift/build_swift/defaults.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/build-presets.ini b/utils/build-presets.ini index 611f53698b914..17aa9a480f6ca 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -19,7 +19,7 @@ swift-install-components=back-deployment;compiler;clang-builtin-headers;stdlib;s [preset: mixin_buildbot_install_components_with_clang] swift-install-components=autolink-driver;back-deployment;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;static-mirror-lib;toolchain-tools;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers -llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;dsymutil;LTO;clang-features-file +llvm-install-components=llvm-ar;llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;dsymutil;LTO;clang-features-file [preset: mixin_buildbot_trunk_base] # Build standard library and SDK overlay for iOS device and simulator. @@ -800,7 +800,7 @@ no-swift-stdlib-assertions [preset: mixin_linux_install_components_with_clang] swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;static-mirror-lib;toolchain-tools;license;sourcekit-inproc -llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;lld;LTO;clang-features-file +llvm-install-components=llvm-ar;llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;lld;LTO;clang-features-file [preset: mixin_linux_installation] mixin-preset= diff --git a/utils/build_swift/build_swift/defaults.py b/utils/build_swift/build_swift/defaults.py index 9711cefca5202..ef2d2d3ff2ebe 100644 --- a/utils/build_swift/build_swift/defaults.py +++ b/utils/build_swift/build_swift/defaults.py @@ -118,7 +118,7 @@ def llvm_install_components(): """Convenience function for getting the default llvm install components for platforms. """ - components = ['llvm-cov', 'llvm-profdata', 'IndexStore', 'clang', + components = ['llvm-ar', 'llvm-cov', 'llvm-profdata', 'IndexStore', 'clang', 'clang-resource-headers', 'compiler-rt', 'clangd'] if os.sys.platform == 'darwin': components.extend(['dsymutil'])