Skip to content

Commit ae661de

Browse files
authored
Merge pull request #67507 from al45tair/eng/PR-112662487-5.9
[Linux] Fix installation of swift-backtrace binary
2 parents b6719fb + f5d2b40 commit ae661de

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

stdlib/cmake/modules/AddSwiftStdlib.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2972,7 +2972,7 @@ function(add_swift_target_executable name)
29722972
add_dependencies(${install_in_component} ${lipo_target})
29732973

29742974
set(install_dest "libexec${LLVM_LIBDIR_SUFFIX}/swift/${resource_dir_sdk_subdir}")
2975-
swift_install_in_component(FILES "${UNIVERSAL_LIBRARY_NAME}"
2975+
swift_install_in_component(FILES "${UNIVERSAL_NAME}"
29762976
DESTINATION ${install_dest}
29772977
COMPONENT "${install_in_component}"
29782978
PERMISSIONS

utils/build-presets.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ no-swift-stdlib-assertions
824824
#===------------------------------------------------------------------------===#
825825
[preset: mixin_linux_install_components_with_clang]
826826

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

830830
[preset: mixin_linux_installation]
@@ -1090,7 +1090,7 @@ install-swift-driver
10901090
install-swiftsyntax
10911091
install-xctest
10921092
install-prefix=/usr
1093-
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;dev
1093+
swift-install-components=autolink-driver;compiler;clang-builtin-headers;libexec;stdlib;swift-remote-mirror;sdk-overlay;dev
10941094
build-swift-static-stdlib
10951095
build-swift-static-sdk-overlay
10961096

@@ -2774,7 +2774,7 @@ xctest
27742774
install-foundation
27752775
install-libdispatch
27762776
install-xctest
2777-
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
2777+
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;libexec;swift-remote-mirror;sdk-overlay;license
27782778

27792779
[preset: source_compat_suite_macos_DA]
27802780
mixin-preset=source_compat_suite_macos_base

0 commit comments

Comments
 (0)