Skip to content

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Aug 19, 2019

This patch supports less behavior than before, since specifiying stage 1
vs stage 2 is no longer possible, but that is presumably a somewhat rare
use case anyway, so not supporting it seems acceptable (and it can be
readded easily if desired).

Fixes #33609

This patch supports less behavior than before, since specifiying stage 1
vs stage 2 is no longer possible, but that is presumably a somewhat rare
use case anyway, so not supporting it seems acceptable (and it can be
readded easily if desired).
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 19, 2019
let s = env::var("RUSTFLAGS_NOT_BOOTSTRAP").unwrap_or_default();
extra_args.push_str(&s);
} else {
let s = env::var("RUSTFLAGS_BOOTSTRAP").unwrap_or_default();
extra_args.push_str(&s);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any chance this could be grouped with the logic for --cfg bootstrap?

@eddyb
Copy link
Member

eddyb commented Aug 20, 2019

r? @alexcrichton (since I'm the one who suggested this in the first place)

@rust-highfive rust-highfive assigned alexcrichton and unassigned eddyb Aug 20, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Aug 20, 2019

📌 Commit 9b3f072 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 20, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 20, 2019
…, r=alexcrichton

Don't use stage naming in RUSTFLAGS environment variables

This patch supports less behavior than before, since specifiying stage 1
vs stage 2 is no longer possible, but that is presumably a somewhat rare
use case anyway, so not supporting it seems acceptable (and it can be
readded easily if desired).

Fixes rust-lang#33609
bors added a commit that referenced this pull request Aug 20, 2019
Rollup of 7 pull requests

Successful merges:

 - #63216 (avoid unnecessary reservations in std::io::Take::read_to_end)
 - #63265 (Implement `nth_back` for ChunksExactMut)
 - #63691 (Fix bug in iter::Chain::size_hint)
 - #63722 (Don't use stage naming in RUSTFLAGS environment variables)
 - #63723 (Consolidate sigemptyset workarounds)
 - #63736 (Restore the rustc_plugin crate in the sysroot)
 - #63743 (Allow git to merge `Cargo.lock`)

Failed merges:

r? @ghost
@bors bors merged commit 9b3f072 into rust-lang:master Aug 20, 2019
g2p added a commit to g2p/rustc-dev-guide that referenced this pull request Nov 24, 2020
jyn514 pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Nov 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support per-stage RUSTFLAGS in rustbuild.
5 participants