Skip to content

Commit 9c1af18

Browse files
committed
Install llvm-ar in the toolchain
A recent SPM change made it mandatory for there to be an archiver in the toolchain/PATH, swiftlang/swift-package-manager#5761, so make sure llvm-ar is bundled in the toolchain.
1 parent e833657 commit 9c1af18

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

utils/build-presets.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ swift-install-components=back-deployment;compiler;clang-builtin-headers;stdlib;s
1919
[preset: mixin_buildbot_install_components_with_clang]
2020

2121
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
22-
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;dsymutil;LTO;clang-features-file
22+
llvm-install-components=llvm-ar;llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;dsymutil;LTO;clang-features-file
2323

2424
[preset: mixin_buildbot_trunk_base]
2525
# Build standard library and SDK overlay for iOS device and simulator.
@@ -800,7 +800,7 @@ no-swift-stdlib-assertions
800800
[preset: mixin_linux_install_components_with_clang]
801801

802802
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;static-mirror-lib;toolchain-tools;license;sourcekit-inproc
803-
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;lld;LTO;clang-features-file
803+
llvm-install-components=llvm-ar;llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;lld;LTO;clang-features-file
804804

805805
[preset: mixin_linux_installation]
806806
mixin-preset=

utils/build_swift/build_swift/defaults.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def llvm_install_components():
118118
"""Convenience function for getting the default llvm install components for
119119
platforms.
120120
"""
121-
components = ['llvm-cov', 'llvm-profdata', 'IndexStore', 'clang',
121+
components = ['llvm-ar', 'llvm-cov', 'llvm-profdata', 'IndexStore', 'clang',
122122
'clang-resource-headers', 'compiler-rt', 'clangd']
123123
if os.sys.platform == 'darwin':
124124
components.extend(['dsymutil'])

0 commit comments

Comments
 (0)