Explicitly set RUSTUP_TOOLCHAIN to 1.64.0 #2440
Conversation
|
This will avoid problems like deltachat/deltachat-core-rust#3856 in the future. Android build can stay with 1.64.0 as long as this toolchain works, there is no need to use the same version for core CI, iOS, Android and Desktop builds. We can then keep updating Rust toolchain that we use for development and even remove the |
|
To test the changes in this pull request, install this apk: |
link2xt
force-pushed
the
link2xt/deprecate-rust-toolchain
branch
from
c9e1d67
to
83b840c
Compare
|
To test the changes in this pull request, install this apk: |
scripts/ndk-make.sh
Outdated
| @@ -108,12 +108,14 @@ if test -z "$(find "$ANDROID_NDK_ROOT" -name libgcc.a -print -quit)"; then | |||
| echo 'INPUT(-lunwind)' >"$TMPLIB/libgcc.a" | |||
| fi | |||
|
|
|||
| RUSTUP_TOOLCHAIN=1.64.0 | |||
There was a problem hiding this comment.
maybe add a comment that when modifying this line, one should also modify install-toolchains.sh. and maybe also say why we are not using cat rust-toolchain - at least i tend to forget about that completely as it is touched only very rarely - and at least some other devs are not that deep in rust :)
| 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 \ | ||
| cargo +`cat rust-toolchain` rustc $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi -- -L "$TMPLIB" | ||
| cargo "+$RUSTUP_TOOLCHAIN" rustc $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi -- -L "$TMPLIB" |
There was a problem hiding this comment.
I'm +/-0 on this PR, because the downside is that this will mean that we need to bump the Rust version in even more places every few months.
But maybe we can create one file rust-toolchain in the dc-android repo that contains the name of the currently used Rust version? This way, we'd only need to update it in one place.
E.g.:
| cargo "+$RUSTUP_TOOLCHAIN" rustc $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi -- -L "$TMPLIB" | |
| cargo +`cat ../../rust-toolchain` rustc $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi -- -L "$TMPLIB" |
link2xt
force-pushed
the
link2xt/deprecate-rust-toolchain
branch
2 times, most recently
from
c85ddb6
to
b126538
Compare
Core is supposed to support all Rust versions above MSRV, there is no need to use the same toolchain for the core across all platforms.
link2xt
force-pushed
the
link2xt/deprecate-rust-toolchain
branch
from
b126538
to
78aada7
Compare
|
To test the changes in this pull request, install this apk: |
Core is supposed to support all Rust versions above MSRV, there is no need to use the same toolchain for the core across all platforms.