summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-util/rustup/files/symlink_rustup.sh3
-rw-r--r--dev-util/rustup/rustup-1.28.2-r2.ebuild (renamed from dev-util/rustup/rustup-1.28.2-r1.ebuild)0
2 files changed, 3 insertions, 0 deletions
diff --git a/dev-util/rustup/files/symlink_rustup.sh b/dev-util/rustup/files/symlink_rustup.sh
index 8ab6608686fc..faa5ba9f81b8 100644
--- a/dev-util/rustup/files/symlink_rustup.sh
+++ b/dev-util/rustup/files/symlink_rustup.sh
@@ -88,11 +88,14 @@ symlink_rustup() {
fi
done
+ # prevent reading rust-toolchain.toml from $(pwd)
+ pushd $(mktemp -d) > /dev/null
good "Setting gentoo ${gentoo_rust// /} as default toolchain"
[[ ${QUIET+set} != set ]] && "${CARGO_HOME}/bin/rustup" -V
"${CARGO_HOME}/bin/rustup" ${QUIET--v} toolchain link gentoo "/usr"
"${CARGO_HOME}/bin/rustup" ${QUIET--v} default gentoo
[[ ${QUIET+set} != set ]] && "${CARGO_HOME}/bin/rustup" show
+ popd > /dev/null
good "Prepend ${CARGO_HOME}/bin to your PATH to use rustup"
good "rustup selfupdate is disabled, it will be updated by portage"
diff --git a/dev-util/rustup/rustup-1.28.2-r1.ebuild b/dev-util/rustup/rustup-1.28.2-r2.ebuild
index 09d89dcb1a8a..09d89dcb1a8a 100644
--- a/dev-util/rustup/rustup-1.28.2-r1.ebuild
+++ b/dev-util/rustup/rustup-1.28.2-r2.ebuild