Rust: Fix build on Arm64

Rust 1.78 and above are subjected to a [bug] leading Arm64 foreign archives to
contain x86 builtins. It looks like we are now triggering this very bug, which
prevents building on Arm64 hardware.

The simplest way to move forward is to downgrade our recommended version of
Rust to 1.77, and wait for a release containing the [fix] to be merged.

[bug]: rust-lang/rust#125619
[fix]: rust-lang/rust#131221

Co-authored-by: Ole Krüger <[email protected]>

Author: 2 people

docs/introduction/compile-sources.sh

@@ -40,7 +40,7 @@ sudo apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc
 # [install rust]
 wget https://sh.rustup.rs/rustup-init.sh
 chmod +x rustup-init.sh
-./rustup-init.sh --profile minimal --default-toolchain 1.78.0 -y
+./rustup-init.sh --profile minimal --default-toolchain 1.77.2 -y
 # [source cargo]
 . $HOME/.cargo/env
 # [get sources]

images/rust-toolchain/Dockerfile

@@ -34,7 +34,7 @@ RUN curl https://sh.rustup.rs --silent --show-error --fail | \
 ENV PATH=/root/.cargo/bin:$PATH
 
 # install rust toolchains and compilation targets
-RUN rustup update 1.66.0 1.73.0 1.76.0 1.78.0 && \
+RUN rustup update 1.66.0 1.73.0 1.76.0 1.77.2 1.78.0 && \
     for tc in $(rustup toolchain list | awk '{print $1}'); do \
     rustup target add --toolchain="$tc" \
     wasm32-unknown-unknown \

rust-toolchain

@@ -1 +1 @@
-1.78.0
+1.77.2

scripts/lint.sh

@@ -185,7 +185,7 @@ check_redirects() {
 }
 
 check_rust_toolchain_files() {
-  authorized_version=("1.66.0" "1.73.0" "1.76.0" "1.78.0")
+  authorized_version=("1.66.0" "1.73.0" "1.76.0" "1.77.2" "1.78.0")
 
   declare -a rust_toolchain_files
   mapfile -t rust_toolchain_files <<< "$(find src/ -name rust-toolchain)"

scripts/version.sh

@@ -19,7 +19,7 @@ export opam_version_major=2
 # The recommended rust version should equal the version set in the
 # root rust-toolchain file, such that:
 # rust-toolchain == recommended_rust_version
-export recommended_rust_version=1.78.0
+export recommended_rust_version=1.77.2
 export recommended_node_version=18.18.2
 
 ## opam_repository is a commit hash of the public opam repository, i.e.
@@ -47,10 +47,10 @@ export dal_srs_g2_sha=97d76e266e657cc3c859c3359c717136f55cfe4c0256ea418f907406cb
 export alpine_version='3.20'
 
 # Installed via apk rust
-export rust_version='1.78.0'
+export rust_version='1.77.2'
 
 # Installed via apk cargo
-export cargo_version='1.78.0'
+export cargo_version='1.77.2'
 
 # Installed via apk opam
 export opam_version='2.2.1'

src/riscv/Makefile

@@ -52,7 +52,8 @@ assets/jstz assets/jstz.checksum::
 
 .PHONY: build-deps
 build-deps:
-	@exec ./scripts/install-rust-std-hermit.sh
+	@make -C jstz build-deps
+	@make -C dummy_kernel build-deps
 	@rustup component add rustfmt clippy
 ifneq ($(NATIVE_TARGET),)
 	@rustup target add $(NATIVE_TARGET)

src/riscv/dummy_kernel/Makefile

@@ -9,6 +9,10 @@ all: build test check
 build:
 	@cargo build --release
 
+.PHONY: build-deps
+build-deps:
+	@exec ../scripts/install-rust-std-hermit.sh
+
 .PHONY: test
 test:
 	@# This executable compiles to RISC-V. It should be run in the RISC-V sandbox.

src/riscv/rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.78.0"
+channel = "1.77.2"
 components = ["rustfmt", "clippy"]