armv5 rust version frozen for no-atomic support (#6108)

* armv5 rust version frozen for no-atomic support
SynoCommunity · May 30, 2024 · 18f68fb · 18f68fb
1 parent b896cd2
commit 18f68fb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/mk/spksrc.cross-rust-env.mk b/mk/spksrc.cross-rust-env.mk
@@ -32,6 +32,7 @@ RUSTUP_DEFAULT_TOOLCHAIN_STAGE = 2
 
 # map archs to rust targets
 ifeq ($(findstring $(RUST_ARCH), $(ARMv5_ARCHS)),$(RUST_ARCH))
+RUSTUP_DEFAULT_TOOLCHAIN = 1.77.2
 RUST_TARGET = armv5te-unknown-linux-gnueabi
 endif
 ifeq ($(findstring $(RUST_ARCH), $(ARMv7_ARCHS)),$(RUST_ARCH))

diff --git a/mk/spksrc.tc-rust.mk b/mk/spksrc.tc-rust.mk
@@ -57,7 +57,7 @@ rust_toml:
  echo "compiler-docs = false" ; \
  echo
  @echo "[rust]" ; \
- echo 'channel = "stable"' ; \
+ echo 'channel = "$(RUSTUP_DEFAULT_TOOLCHAIN)"' ; \
  echo 'lto = "off"' ; \
  echo
  @echo "[llvm]" ; \
@@ -104,7 +104,7 @@ rustc_target: $(PRE_RUSTC_TARGET) $(TC_LOCAL_VARS_RUST)
  flock -u 5
 ifeq ($(TC_RUSTUP_TOOLCHAIN),$(RUSTUP_DEFAULT_TOOLCHAIN))
  @$(MSG) "rustup target add $(RUST_TARGET)"
- rustup override set stable
+ rustup override set $(RUSTUP_DEFAULT_TOOLCHAIN)
  rustup target add $(RUST_TARGET)
  rustup show
 else

diff --git a/mk/spksrc.tc.mk b/mk/spksrc.tc.mk
@@ -11,6 +11,7 @@ include ../../mk/spksrc.common.mk
 ### Include common rules
 include ../../mk/spksrc.common-rules.mk
 
+# Include ross-rust-env.mk to generate install its toolchain
 include ../../mk/spksrc.cross-rust-env.mk
 
 # Include cross-cmake-env.mk to generate its toolchain file
@@ -19,9 +20,6 @@ include ../../mk/spksrc.cross-cmake-env.mk
 # Include cross-meson-env.mk to generate its toolchain file
 include ../../mk/spksrc.cross-meson-env.mk
 
-##### rust specific configurations
-include ../../mk/spksrc.cross-rust-env.mk
-
 # Configure the included makefiles
 URLS = $(TC_DIST_SITE)/$(TC_DIST_NAME)
 NAME = $(TC_NAME)