From 160d1f471ea000d164d8a6a99f16f0435d53bb83 Mon Sep 17 00:00:00 2001
From: "Jesse L. Zamora" <xtremekforever@gmail.com>
Date: Sun, 2 Mar 2025 07:02:59 -0500
Subject: [PATCH] Deploy Swift to sysroot due to swiftc in 6.1 and later
 requiring swiftrt.o in the sysroot instead of resource-dir

---
 build-swift-stdlib.sh | 3 +++
 deploy-to-sysroot.sh  | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-swift-stdlib.sh b/build-swift-stdlib.sh
index 5255cbf..0b739a5 100755
--- a/build-swift-stdlib.sh
+++ b/build-swift-stdlib.sh
@@ -69,3 +69,6 @@ echo "Build Swift StdLib"
 
 echo "Install Swift StdLib"
 (cd $SWIFT_BUILDDIR && ninja install)
+
+echo "Install Swift Stdlib to sysroot"
+cp -rf ${SWIFT_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
diff --git a/deploy-to-sysroot.sh b/deploy-to-sysroot.sh
index bef2805..f1d8673 100755
--- a/deploy-to-sysroot.sh
+++ b/deploy-to-sysroot.sh
@@ -2,9 +2,6 @@
 set -e
 source swift-define
 
-echo "Install Swift Stdlib to sysroot"
-cp -rf ${SWIFT_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
-
 echo "Install Dispatch to sysroot"
 cp -rf ${LIBDISPATCH_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/