From 84a767dc17c2622c6bb2aa20873083bbea1f297b Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Tue, 28 Feb 2023 22:45:18 +0000
Subject: [PATCH] scripts/ndk-make.sh: use absolute paths for TARGET_{CC,AR}

Do not assume that $PATH contains toolchain bin/
---
 scripts/ndk-make.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/ndk-make.sh b/scripts/ndk-make.sh
index be46394e1..b6487cd72 100755
--- a/scripts/ndk-make.sh
+++ b/scripts/ndk-make.sh
@@ -115,8 +115,8 @@ fi
 if test -z $1 || test $1 = armeabi-v7a; then
     echo "-- cross compiling to armv7-linux-androideabi (arm) --"
     export CFLAGS=-D__ANDROID_API__=16
-    TARGET_CC=armv7a-linux-androideabi16-clang \
-    TARGET_AR=llvm-ar \
+    TARGET_CC="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang" \
+    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
     cargo rustc $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi -- -L "$TMPLIB"
     cp target/armv7-linux-androideabi/$RELEASE/libdeltachat.a $jnidir/armeabi-v7a
 fi
@@ -124,8 +124,8 @@ fi
 if test -z $1 || test $1 = arm64-v8a; then
     echo "-- cross compiling to aarch64-linux-android (arm64) --"
     export CFLAGS=-D__ANDROID_API__=21
-    TARGET_CC=aarch64-linux-android21-clang \
-    TARGET_AR=llvm-ar \
+    TARGET_CC="$TOOLCHAIN/bin/aarch64-linux-android21-clang" \
+    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
     cargo rustc $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi -- -L "$TMPLIB"
     cp target/aarch64-linux-android/$RELEASE/libdeltachat.a $jnidir/arm64-v8a
 fi
@@ -133,8 +133,8 @@ fi
 if test -z $1 || test $1 = x86; then
     echo "-- cross compiling to i686-linux-android (x86) --"
     export CFLAGS=-D__ANDROID_API__=16
-    TARGET_CC=i686-linux-android16-clang \
-    TARGET_AR=llvm-ar \
+    TARGET_CC="$TOOLCHAIN/bin/i686-linux-android16-clang" \
+    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
     cargo rustc $RELEASEFLAG --target i686-linux-android -p deltachat_ffi -- -L "$TMPLIB"
     cp target/i686-linux-android/$RELEASE/libdeltachat.a $jnidir/x86
 fi
@@ -142,8 +142,8 @@ fi
 if test -z $1 || test $1 = x86_64; then
     echo "-- cross compiling to x86_64-linux-android (x86_64) --"
     export CFLAGS=-D__ANDROID_API__=21
-    TARGET_CC=x86_64-linux-android21-clang \
-    TARGET_AR=llvm-ar \
+    TARGET_CC="$TOOLCHAIN/bin/x86_64-linux-android21-clang" \
+    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
     cargo rustc $RELEASEFLAG --target x86_64-linux-android -p deltachat_ffi -- -L "$TMPLIB"
     cp target/x86_64-linux-android/$RELEASE/libdeltachat.a $jnidir/x86_64
 fi