bootstrap: add config option for nix patching #89426
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
|
Hm, I would prefer that we have this as a config.toml flag (e.g., "patch-binaries-for-nix = true/false" or so). Would that work for you? The reason to prefer an env variable is that you can set it in e.g. .bashrc or so and just get it for any rustc bootstrap, I suppose, but it feels a little icky to me to have configuration via that vector. Is there a way for us to detect that you're "wanting" to use nix that's not /etc/os-release? For example, maybe if .nix-deps exists or so we can assume we're on nix? |
Mark-Simulacrum
added
S-waiting-on-author
davidtwco
force-pushed
the
bootstrap-nix-toolchain-env-var
branch
from
a1b785b to
98a8c1d
Compare
davidtwco
changed the title
On NixOS systems, bootstrap will patch rustc used in bootstrapping after checking `/etc/os-release` (to confirm the current distribution is NixOS). However, when using Nix on a non-NixOS system, it can be desirable for bootstrap to patch rustc. In this commit, a `patch-binaries-for-nix` option is added to `config.toml`, which allows for user opt-in to bootstrap's Nix patching. Signed-off-by: David Wood <david.wood@huawei.com>
davidtwco
force-pushed
the
bootstrap-nix-toolchain-env-var
branch
from
98a8c1d to
e552c0d
Compare
davidtwco
added
S-waiting-on-review
This works for me, I’ve updated the PR with this approach. |
|
@bors r+ We might eventually want to make an explicit false opt-out (with the default being conditional on platform, like before this PR), but seems OK for now. We haven't heard any asks to opt out anyway. |
|
📌 Commit e552c0d has been approved by |
bors
added
S-waiting-on-bors
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Oct 3, 2021
…nv-var, r=Mark-Simulacrum bootstrap: add config option for nix patching On NixOS systems, bootstrap will patch rustc used in bootstrapping after checking `/etc/os-release` (to confirm the current distribution is NixOS). However, when using Nix on a non-NixOS system, it can be desirable for bootstrap to patch rustc. In this commit, a `patch-binaries-for-nix` option is added to `config.toml`, which allows for user opt-in to bootstrap's Nix patching. r? `@Mark-Simulacrum`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 5, 2021
…arth Rollup of 12 pull requests Successful merges: - rust-lang#87631 (os current_exe using same approach as linux to get always the full ab…) - rust-lang#88234 (rustdoc-json: Don't ignore impls for primitive types) - rust-lang#88651 (Use the 64b inner:monotonize() implementation not the 128b one for aarch64) - rust-lang#88816 (Rustdoc migrate to table so the gui can handle >2k constants) - rust-lang#89244 (refactor: VecDeques PairSlices fields to private) - rust-lang#89364 (rustdoc-json: Encode json files with UTF-8) - rust-lang#89423 (Fix ICE caused by non_exaustive_omitted_patterns struct lint) - rust-lang#89426 (bootstrap: add config option for nix patching) - rust-lang#89462 (haiku thread affinity build fix) - rust-lang#89482 (Follow the diagnostic output style guide) - rust-lang#89504 (Don't suggest replacing region with 'static in NLL) - rust-lang#89535 (fix busted JavaScript in error index generator) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On NixOS systems, bootstrap will patch rustc used in bootstrapping after checking
/etc/os-release(to confirm the current distribution is NixOS). However, when using Nix on a non-NixOS system, it can be desirable for bootstrap to patch rustc. In this commit, apatch-binaries-for-nixoption is added toconfig.toml, which allows for user opt-in to bootstrap's Nix patching.r? @Mark-Simulacrum