From 6d47c22e054c0932db17abafb105dba6cb886eeb Mon Sep 17 00:00:00 2001 From: Andrew Dona-Couch -- GitHub drop ICE Date: Wed, 8 Dec 2021 00:04:56 -0500 Subject: [PATCH 1/2] Clarify cargo fallback behavior for rustup link When building and testing on a new system (without an installed `nightly` toolchain), the default behavior of `rustup link` can seem a bit surprising. This change adds a note to the section on `rustup link` to help clarify what's happening and how to fix it. --- src/building/how-to-build-and-run.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/building/how-to-build-and-run.md b/src/building/how-to-build-and-run.md index ae3aabf12..2d49ace99 100644 --- a/src/building/how-to-build-and-run.md +++ b/src/building/how-to-build-and-run.md @@ -217,6 +217,11 @@ The rustup toolchain points to the specified toolchain compiled in your `build` so the rustup toolchain will be updated whenever `x.py build` or `x.py test` are run for that toolchain/stage. +**Note:** the toolchain we've built does not include `cargo`. In this case, `rustup` will +fall back to using `cargo` from the installed `nightly`, `beta`, or `stable` toolchain +(in that order). If you need to use unstable `cargo` flags, be sure to run +`rustup install nightly` if you haven't already. + ## Other `x.py` commands Here are a few other useful `x.py` commands. We'll cover some of them in detail From f7b068fbc776a50fc9949887d38ae5b11fb52f9e Mon Sep 17 00:00:00 2001 From: Andrew Dona-Couch -- GitHub drop ICE Date: Mon, 6 Jun 2022 12:06:35 -0400 Subject: [PATCH 2/2] Add link to rustup docs on custom toolchains --- src/building/how-to-build-and-run.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/building/how-to-build-and-run.md b/src/building/how-to-build-and-run.md index 2d49ace99..c74bff2c3 100644 --- a/src/building/how-to-build-and-run.md +++ b/src/building/how-to-build-and-run.md @@ -220,7 +220,8 @@ that toolchain/stage. **Note:** the toolchain we've built does not include `cargo`. In this case, `rustup` will fall back to using `cargo` from the installed `nightly`, `beta`, or `stable` toolchain (in that order). If you need to use unstable `cargo` flags, be sure to run -`rustup install nightly` if you haven't already. +`rustup install nightly` if you haven't already. See the +[rustup documentation on custom toolchains](https://rust-lang.github.io/rustup/concepts/toolchains.html#custom-toolchains). ## Other `x.py` commands