From 88aeaf61ce0b69260f59c92332ed6ac7a6031741 Mon Sep 17 00:00:00 2001
From: Alastair Houghton <ahoughton@apple.com>
Date: Mon, 24 Jul 2023 12:46:18 +0100
Subject: [PATCH 1/2] [Linux] Make sure we install libexec.

We weren't installing the libexec component for Linux.

rdar://112662487
---
 utils/build-presets.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 3b6f376e511c7..cd2fc6c4c5972 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -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]
@@ -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
 
@@ -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

From f5d2b401c949c9ea0734a0914912fe75c8fdc189 Mon Sep 17 00:00:00 2001
From: Alastair Houghton <ahoughton@apple.com>
Date: Tue, 25 Jul 2023 12:13:07 +0100
Subject: [PATCH 2/2] [Linux][Backtracing] Fix CMake scripts to install
 correctly.

The script erroneously used `UNIVERSAL_LIBRARY_NAME` instead of
`UNIVERSAL_NAME`.

rdar://112662487
---
 stdlib/cmake/modules/AddSwiftStdlib.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stdlib/cmake/modules/AddSwiftStdlib.cmake b/stdlib/cmake/modules/AddSwiftStdlib.cmake
index 735587543f954..898eb7a81c41c 100644
--- a/stdlib/cmake/modules/AddSwiftStdlib.cmake
+++ b/stdlib/cmake/modules/AddSwiftStdlib.cmake
@@ -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