rust: Fix issue where cargo switches from stable to version X (#5622)

* bottom: Update from version 0.6.8 to 0.8.0

* rust: Fix issue where cargo switches from stable to version X

cross/bottom/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = bottom
-PKG_VERS = 0.6.8
+PKG_VERS = 0.8.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/ClementTsang/bottom/archive

cross/bottom/digests

@@ -1,3 +1,3 @@
-bottom-0.6.8.tar.gz SHA1 72d9b6be51b1d5ca6a3d100cbd60c41e11fda2bf
-bottom-0.6.8.tar.gz SHA256 4e4eb251972a7af8c46dd36bcf1335fea334fb670569434fbfd594208905b2d9
-bottom-0.6.8.tar.gz MD5 f694537adb9d46cdf791ce417ca59e46
+bottom-0.8.0.tar.gz SHA1 f28f3bfcabe9ef26d5a699eeecbffba2a94f8d1d
+bottom-0.8.0.tar.gz SHA256 0fe6a826d18570ab33b2af3b26ce28c61e3aa830abb2b622f2c3b81da802437a
+bottom-0.8.0.tar.gz MD5 205e7dd31a91288eddc709adabd0b264

mk/spksrc.cross-rust-env.mk

@@ -8,7 +8,9 @@ export RUSTUP_HOME=$(BASE_DISTRIB_DIR)/rustup
 export PATH:=$(BASE_DISTRIB_DIR)/cargo/bin:$(PATH)
 endif
 
-RUST_TOOLCHAIN ?= stable
+ifeq ($(RUST_TOOLCHAIN),)
+RUST_TOOLCHAIN = stable
+endif
 
 RUST_TARGET =
 # map archs to rust targets

mk/spksrc.cross-rust.mk

@@ -56,7 +56,7 @@ CARGO_INSTALL_ARGS += --root $(STAGING_INSTALL_PREFIX)
 # Default build with rust and installation with cargo
 rust_install_target:
 	@echo "  ==> Cargo install rust package $(PKG_NAME)"
-	@$(RUN) cargo install $(CARGO_INSTALL_ARGS)
+	@$(RUN) cargo +$(RUST_TOOLCHAIN) install $(CARGO_INSTALL_ARGS)
 
 
 #####