Skip to content

[Linux] Fix installation of swift-backtrace binary #67507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 25, 2023
Merged

[Linux] Fix installation of swift-backtrace binary #67507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88aeaf6
[Linux] Make sure we install libexec.
al45tair Jul 24, 2023
f5d2b40
[Linux][Backtracing] Fix CMake scripts to install correctly.
al45tair Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stdlib/cmake/modules/AddSwiftStdlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2972,7 +2972,7 @@ function(add_swift_target_executable name)
add_dependencies(${install_in_component} ${lipo_target})

set(install_dest "libexec${LLVM_LIBDIR_SUFFIX}/swift/${resource_dir_sdk_subdir}")
swift_install_in_component(FILES "${UNIVERSAL_LIBRARY_NAME}"
swift_install_in_component(FILES "${UNIVERSAL_NAME}"
DESTINATION ${install_dest}
COMPONENT "${install_in_component}"
PERMISSIONS
Expand Down
6 changes: 3 additions & 3 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,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
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
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]
Expand Down Expand Up @@ -1090,7 +1090,7 @@ install-swift-driver
install-swiftsyntax
install-xctest
install-prefix=/usr
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;dev
swift-install-components=autolink-driver;compiler;clang-builtin-headers;libexec;stdlib;swift-remote-mirror;sdk-overlay;dev
build-swift-static-stdlib
build-swift-static-sdk-overlay

Expand Down Expand Up @@ -2774,7 +2774,7 @@ xctest
install-foundation
install-libdispatch
install-xctest
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;libexec;swift-remote-mirror;sdk-overlay;license

[preset: source_compat_suite_macos_DA]
mixin-preset=source_compat_suite_macos_base
Expand Down