vargo: Decouple from rustup #877
Conversation
| if let Ok(sysroot) = std::env::var("RUST_SYSROOT") { | ||
| child_args.push("--sysroot".to_string()); | ||
| child_args.push(sysroot); | ||
| } |
There was a problem hiding this comment.
Why do you need this? Is it to set a sysroot manually, that would otherwise be set by rustup?
There was a problem hiding this comment.
(Somehow missed the notification, my apologies)
Yes, rustup wrappers automatically set the correct LD_LIBRARY_PATH (or equivalents on other platforms) when executing the toolchain binaries, and binaries distributed by rust-overlay and fenix have their runpaths patched so the default sysroot detection logic works.
There was a problem hiding this comment.
Thanks! Do you know if there's a way to set the sysroot for rustc with an environment variable? Or is it just the --sysroot flag?
There was a problem hiding this comment.
(Sorry again)
I quickly looked, and I couldn't find an environment variable to do this override.
zhaofengli
force-pushed
the
decouple-rustup
branch
from
22394c9
to
0b4c9f8
Compare
|
Sorry all, it's been a while but I rebased the PR on top of the latest changes. |
zhaofengli
force-pushed
the
decouple-rustup
branch
from
0b4c9f8
to
06b1222
Compare
This PR makes vargo aware of a new environment variable,
VARGO_TOOLCHAIN, which can be one of the following:rust-toolchain.toml(current behavior)host: Uses the Rust toolchain fromPATH(3) allows Verus to be built without rustup, which is useful when the Rust toolchain is managed by something else like Nix + rust-overlay. Furthermore, (2) can be used to temporarily override the rustup toolchain to test Rust updates.
We've been using this downstream for a while since we use Nix to manage everything. We are submitting this upstream to see if this is something you would like and to stop bumping into merge conflicts 😄