Skip to content

Commit 9090990

Browse files
committed
[build] Add Clang's features file to the toolchain
I confirmed that the toolchain contained the features file after LLVM Project af7ae6a, not sure when it disappeared. Explicitly add it to the install components in the toolchain presets. Resolves rdar://88446151.
1 parent 4b8ba3c commit 9090990

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

utils/build-presets.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ swift-install-components=back-deployment;compiler;clang-builtin-headers;stdlib;s
1818

1919
[preset: mixin_buildbot_install_components_with_clang]
2020
swift-install-components=back-deployment;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
21-
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;dsymutil;LTO
21+
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;dsymutil;LTO;clang-features-file
2222

2323
[preset: mixin_buildbot_trunk_base]
2424
# Build standard library and SDK overlay for iOS device and simulator.
@@ -807,7 +807,7 @@ no-swift-stdlib-assertions
807807
#===------------------------------------------------------------------------===#
808808
[preset: mixin_linux_install_components_with_clang]
809809
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc
810-
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;lld;LTO
810+
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;lld;LTO;clang-features-file
811811

812812
[preset: mixin_linux_installation]
813813
mixin-preset=
@@ -2618,7 +2618,7 @@ darwin-toolchain-display-name-short=Swift Development Snapshot
26182618
darwin-toolchain-display-name=Swift Development Snapshot
26192619
darwin-toolchain-name=swift-DEVELOPMENT-SNAPSHOT
26202620
darwin-toolchain-version=3.999.999
2621-
llvm-install-components=clang;clang-resource-headers;compiler-rt;libclang;libclang-headers;dsymutil
2621+
llvm-install-components=clang;clang-resource-headers;compiler-rt;libclang;libclang-headers;dsymutil;clang-features-file
26222622
swift-install-components=back-deployment;compiler;clang-builtin-headers;stdlib;sdk-overlay;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
26232623
symbols-package=%(symbols_package)s
26242624
install-symroot=%(install_symroot)s

0 commit comments

Comments
 (0)