commit: 1f03ca6b4f8d8a9afc3c114f1ba888c843af9901 Author: Pepper Gray <hello <AT> peppergray <DOT> xyz> AuthorDate: Sun Oct 26 09:05:15 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 4 11:08:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f03ca6b
dev-util/rustup: use system toolchain and ignore rust-toolchain.toml Rustup reads rust-toolchain.toml if present in $(pwd) which may cause undesired behavior. Change to a temp dir bevor executing rustup to prevent this behavior. [sam: Revbump to propagate the fix.] Closes: https://bugs.gentoo.org/965147 Signed-off-by: Pepper Gray <hello <AT> peppergray.xyz> Part-of: https://github.com/gentoo/gentoo/pull/44341 Closes: https://github.com/gentoo/gentoo/pull/44341 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/rustup/files/symlink_rustup.sh | 3 +++ dev-util/rustup/{rustup-1.28.2-r1.ebuild => rustup-1.28.2-r2.ebuild} | 0 2 files changed, 3 insertions(+) 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 similarity index 100% rename from dev-util/rustup/rustup-1.28.2-r1.ebuild rename to dev-util/rustup/rustup-1.28.2-r2.ebuild
