Skip to content

Commit ce1ac0f

Browse files
committed
feat: musl and gnu toolchains
1 parent 02662df commit ce1ac0f

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

scripts/install/cargo_tooling.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x shl
33
set -o pipefail
44

55
# install cargo-binstall
6-
sudo wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-gnu.tgz -O /usr/local/bin/cargo-binstall.tgz
6+
sudo wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-$(uname -m)-unknown-linux-musl.tgz -O /usr/local/bin/cargo-binstall.tgz
77
sudo tar -xf /usr/local/bin/cargo-binstall.tgz -C /usr/local/bin/
88

99
# install cargo subcommands via cargo-binstall

scripts/install/container_tooling.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ export DOCKER_HOST=unix:///var/run/docker.sock
4444

4545
mkdir -p $XDG_RUNTIME_DIR
4646

47-
sudo echo "$USER:100000:65536" | sudo tee /etc/subuid
48-
sudo echo "$USER:100000:65536" | sudo tee /etc/subgid
47+
sudo echo "$USER:100000:65536" >> /etc/subuid
48+
sudo echo "$USER:100000:65536" >> /etc/subgid
4949

5050
export FORCE_ROOTLESS_INSTALL="true"
5151

scripts/install/rust_tooling.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ rustup self update
66

77
# setup rust and rust components
88
install_rustup_channel_with_components() {
9-
rustup default $1
9+
rustup toolchain install $1
1010
rustup component add rustfmt rust-std rust-docs clippy cargo rust-src rust-analysis --toolchain $1
1111
}
1212

13-
install_rustup_channel_with_components beta &\
14-
install_rustup_channel_with_components nightly &\
15-
install_rustup_channel_with_components stable &\
13+
install_rustup_channel_with_components beta-musl &\
14+
install_rustup_channel_with_components nightly-musl &\
15+
install_rustup_channel_with_components stable-musl &\
16+
install_rustup_channel_with_components beta-gnu &\
17+
install_rustup_channel_with_components nightly-gnu &\
18+
install_rustup_channel_with_components stable-gnu &\
1619
wait

0 commit comments

Comments
 (0)