Only install a single rust toolchain in aarch64 env

mtreinish · Feb 22, 2025 · fae956b · fae956b
1 parent bbb2303
commit fae956b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/tools/build_pgo.sh b/tools/build_pgo.sh
@@ -34,8 +34,4 @@ python tools/pgo_scripts/test_utility_scale.py
 
 deactivate
 
-if [[ `uname -m` == "aarch64" ]]; then
-    ${HOME}/.rustup/toolchains/1.79-aarch64-unknown-linux-gnu/lib/rustlib/$arch*/bin/llvm-profdata merge -o "$out_path" "$work_dir"
-else
-    ${HOME}/.rustup/toolchains/*$arch*/lib/rustlib/$arch*/bin/llvm-profdata merge -o "$out_path" "$work_dir"
-fi
+${HOME}/.rustup/toolchains/*$arch*/lib/rustlib/$arch*/bin/llvm-profdata merge -o "$out_path" "$work_dir"
diff --git a/tools/install_rust_msrv.sh b/tools/install_rust_msrv.sh
@@ -5,5 +5,6 @@ if [ ! -d rust-installer ]; then
     sh rust-installer/rustup.sh -y -c llvm-tools
     rustup default 1.79
     rustup component add llvm-tools
+    rustup uninstall stable
 fi
 . "$HOME/.cargo/env"