yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

scripts/ndk-make.sh: use absolute paths for TARGET_{CC,AR}

Browse source 
Do not assume that $PATH contains toolchain bin/
This commit is contained in:
link2xt 2023-02-28 22:45:18 +00:00
parent be8f9f1468
commit 84a767dc17
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/ndk-make.sh
View file

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