Allow bootstrapping without a key. Fixes #36548 #37265
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
brson
added
the
beta-nominated
|
Nominating to get this convenience for packagers in their hand sooner. The backport will require changing the transitionary key. |
|
cc @nagisa |
|
Oh I see a problem with this patch that makes me wonder how it's building successfully... |
This will make it easier for packagers to bootstrap rustc when they happen to have a bootstrap compiler with a slightly different version number. It's not ok for anything other than the build system to set this environment variable.
|
OK, fixed. The answer to how it was building successfully is that there are two build systems. |
|
@bors: r+ p=1 Higher priority as we're likely to backport this. |
|
📌 Commit d3c5905 has been approved by |
nagisa
reviewed
Oct 19, 2016
| cmd.env("RUSTC_BOOTSTRAP_KEY", bootstrap_key); | ||
| fn add_bootstrap_key(&self, cmd: &mut Command) { | ||
| cmd.env("RUSTC_BOOTSTRAP", ""); | ||
| // FIXME: Transitionary measure to bootstrap using the old bootstrap logic. |
There was a problem hiding this comment.
This should be SNAP, I think? I don’t think anybody looks at FIXMEs on a rollover (though I suspect nobody looks at SNAPs either anymore?)
|
Seems good to me. |
eddyb
added a commit
to eddyb/rust
that referenced
this pull request
Oct 19, 2016
Allow bootstrapping without a key. Fixes rust-lang#36548 This will make it easier for packagers to bootstrap rustc when they happen to have a bootstrap compiler with a slightly different version number. It's not ok for anything other than the build system to set this environment variable. r? @alexcrichton
|
⌛ Testing commit d3c5905 with merge 2918ab8... |
eddyb
added a commit
to eddyb/rust
that referenced
this pull request
Oct 19, 2016
Allow bootstrapping without a key. Fixes rust-lang#36548 This will make it easier for packagers to bootstrap rustc when they happen to have a bootstrap compiler with a slightly different version number. It's not ok for anything other than the build system to set this environment variable. r? @alexcrichton
|
⛄ The build was interrupted to prioritize another pull request. |
bluss
added
the
relnotes
cuviper
added a commit
to cuviper/rust
that referenced
this pull request
Oct 19, 2016
A new point-release shouldn't change any language semantics, so a local stage0 that matches MAJOR.MINOR version should still be considered a local-rebuild as far as `--cfg stageN` features go. e.g. `1.14.0` should be considered a local-rebuild for any `1.14.X`. (Bootstrap keys used to be an issue too, until rust-lang#37265.)
bors
added a commit
that referenced
this pull request
Oct 20, 2016
Detect local-rebuild by just the MAJOR.MINOR version A new point-release shouldn't change any language semantics, so a local stage0 that matches MAJOR.MINOR version should still be considered a local-rebuild as far as `--cfg stageN` features go. e.g. `1.14.0` should be considered a local-rebuild for any `1.14.X`. (Bootstrap keys used to be an issue too, until #37265.)
brson
removed
the
relnotes
alexcrichton
added
the
beta-accepted
Merged
the-kenny
added a commit
to NixOS/nixpkgs
that referenced
this pull request
Nov 28, 2016
Newer nightlies check a new environment variable that if set will loosen restrictions on which compiler version can be used for bootstrapping. Upstream issue is at rust-lang/rust#37265
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.
This will make it easier for packagers to bootstrap rustc when they happen
to have a bootstrap compiler with a slightly different version number.
It's not ok for anything other than the build system to set this environment variable.
r? @alexcrichton