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

scripts/ndk-make.sh: export RUSTUP_TOOLCHAIN

Browse source 
This allows to build the core on systems without rustup.
In this case system rust is used,
but there is no error due to `+1.64.0`
being unknown argument to non-rustup cargo.
This commit is contained in:
link2xt 2023-02-28 22:38:43 +00:00
parent 8ed79c5b27
commit be8f9f1468
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/ndk-make.sh
View file

@ -64,7 +64,7 @@ export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-a
export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang" export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang"
export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang" export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang"
RUSTUP_TOOLCHAIN=$(cat "$(dirname "$0")/rust-toolchain") export RUSTUP_TOOLCHAIN=$(cat "$(dirname "$0")/rust-toolchain")
# Check if the argument is a correct architecture: # Check if the argument is a correct architecture:
if test $1 && echo "armeabi-v7a arm64-v8a x86 x86_64" | grep -vwq -- $1; then if test $1 && echo "armeabi-v7a arm64-v8a x86 x86_64" | grep -vwq -- $1; then
@ -117,7 +117,7 @@ if test -z $1 || test $1 = armeabi-v7a; then
export CFLAGS=-D__ANDROID_API__=16 export CFLAGS=-D__ANDROID_API__=16
TARGET_CC=armv7a-linux-androideabi16-clang \ TARGET_CC=armv7a-linux-androideabi16-clang \
TARGET_AR=llvm-ar \ TARGET_AR=llvm-ar \
cargo "+$RUSTUP_TOOLCHAIN" 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
@ -126,7 +126,7 @@ if test -z $1 || test $1 = arm64-v8a; then
export CFLAGS=-D__ANDROID_API__=21 export CFLAGS=-D__ANDROID_API__=21
TARGET_CC=aarch64-linux-android21-clang \ TARGET_CC=aarch64-linux-android21-clang \
TARGET_AR=llvm-ar \ TARGET_AR=llvm-ar \
cargo "+$RUSTUP_TOOLCHAIN" 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
@ -135,7 +135,7 @@ if test -z $1 || test $1 = x86; then
export CFLAGS=-D__ANDROID_API__=16 export CFLAGS=-D__ANDROID_API__=16
TARGET_CC=i686-linux-android16-clang \ TARGET_CC=i686-linux-android16-clang \
TARGET_AR=llvm-ar \ TARGET_AR=llvm-ar \
cargo "+$RUSTUP_TOOLCHAIN" 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
@ -144,7 +144,7 @@ if test -z $1 || test $1 = x86_64; then
export CFLAGS=-D__ANDROID_API__=21 export CFLAGS=-D__ANDROID_API__=21
TARGET_CC=x86_64-linux-android21-clang \ TARGET_CC=x86_64-linux-android21-clang \
TARGET_AR=llvm-ar \ TARGET_AR=llvm-ar \
cargo "+$RUSTUP_TOOLCHAIN" 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