From 43e5ddfb0a66f4df3a9142af5faf23b36b2ce08b Mon Sep 17 00:00:00 2001
From: Butta <repo@butta.fastem.com>
Date: Fri, 7 Apr 2023 13:56:04 +0530
Subject: [PATCH] rebuild(cookcli): fix build with new Swift runtime libraries
 location

---
 packages/cookcli/build.sh                 | 2 +-
 scripts/build/setup/termux_setup_swift.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/cookcli/build.sh b/packages/cookcli/build.sh
index 4f0f6d9aeb..1f698ed37c 100644
--- a/packages/cookcli/build.sh
+++ b/packages/cookcli/build.sh
@@ -17,7 +17,7 @@ TERMUX_PKG_ENABLE_CLANG16_PORTING=false
 termux_step_make() {
 	termux_setup_swift
 
-	# This will check out the package dependencies, so one can be patched.
+	# This will check out the package dependencies, so one can be patched first.
 	$SWIFT_BINDIR/swift package update
 
 	patch -p1 < $TERMUX_PKG_BUILDER_DIR/cook-dependencies.diff
diff --git a/scripts/build/setup/termux_setup_swift.sh b/scripts/build/setup/termux_setup_swift.sh
index 72f150cbc9..2bbbc48f88 100644
--- a/scripts/build/setup/termux_setup_swift.sh
+++ b/scripts/build/setup/termux_setup_swift.sh
@@ -26,6 +26,8 @@ termux_setup_swift() {
 		export SWIFT_BINDIR="$SWIFT_FOLDER/usr/bin"
 		export SWIFT_CROSSCOMPILE_CONFIG="$SWIFT_FOLDER/usr/android-$TERMUX_ARCH.json"
 		if [ ! -z ${TERMUX_STANDALONE_TOOLCHAIN+x} ]; then
+			local MULTILIB_DIR="$TERMUX_ARCH-linux-android"
+			test $TERMUX_ARCH == 'arm' && MULTILIB_DIR+="eabi"
 			cat <<- EOF > $SWIFT_CROSSCOMPILE_CONFIG
 			{ "version": 1,
 			"target": "${SWIFT_TARGET_TRIPLE}",
@@ -34,7 +36,7 @@ termux_setup_swift() {
 			"extra-cc-flags": [ "-fPIC" ],
 			"extra-swiftc-flags": [ "-resource-dir", "${TERMUX_PREFIX}/lib/swift",
 			   "-Xcc", "-I${TERMUX_PREFIX}/include",
-			   "-L${TERMUX_PREFIX}/lib",
+			   "-L${TERMUX_PREFIX}/opt/ndk-multilib/$MULTILIB_DIR/lib", "-L${TERMUX_PREFIX}/lib",
 			   "-tools-directory", "${TERMUX_STANDALONE_TOOLCHAIN}/bin", ],
 			"extra-cpp-flags": [ "-lstdc++" ] }
 			EOF