From b6066cbcdd6e0b5ee77ba8febb2887d61c586f9d Mon Sep 17 00:00:00 2001 From: zhanghj Date: Thu, 24 Sep 2020 22:35:50 -0400 Subject: [PATCH] osbuilder: specify default toolchain verion in rust-init. Specify default toolchain version in rust-init. Fixes: #799 Signed-off-by: zhanghj --- tools/osbuilder/scripts/lib.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/osbuilder/scripts/lib.sh b/tools/osbuilder/scripts/lib.sh index dbd6b3dbde..e7a39d889a 100644 --- a/tools/osbuilder/scripts/lib.sh +++ b/tools/osbuilder/scripts/lib.sh @@ -319,13 +319,11 @@ RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSLf --output /tmp/rus chmod a+x /tmp/rust-init; \ export http_proxy=${http_proxy:-}; \ export https_proxy=${http_proxy:-}; \ - /tmp/rust-init -y + /tmp/rust-init -y --default-toolchain ${RUST_VERSION} RUN . /root/.cargo/env; \ export http_proxy=${http_proxy:-}; \ export https_proxy=${http_proxy:-}; \ cargo install cargo-when; \ - rustup toolchain install ${RUST_VERSION}; \ - rustup default ${RUST_VERSION}; \ rustup target install ${rustarch}-unknown-linux-musl RUN ln -sf /usr/bin/g++ /bin/musl-g++ "