Skip to content

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Mar 22, 2021

This allows keeping the setting to a fixed value without having to
toggle it when you want to work on the compiler instead of on tools.

This sets BOOTSTRAP_DOWNLOAD_RUSTC in bootstrap.py so rustbuild doesn't have to try and replicate its logic.

Helps with #81930.

r? @Mark-Simulacrum cc @camelid

@jyn514 jyn514 added C-enhancement Category: An issue proposing an enhancement or a PR with one. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-contributor-roadblock Area: Makes things more difficult for new or seasoned contributors to Rust labels Mar 22, 2021
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 22, 2021
@jyn514
Copy link
Member Author

jyn514 commented Mar 31, 2021

@Mark-Simulacrum do you know when you'll have a chance to look at this? It's an easy +12 -4, the only thing questionable is that it sets more env variables from bootstrap.py.

@Mark-Simulacrum
Copy link
Member

r=me if the error message points at download-rustc somehow

@jyn514
Copy link
Member Author

jyn514 commented Apr 4, 2021

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Apr 4, 2021

📌 Commit 7f5964a has been approved by Mark-Simulacrum

@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 Apr 4, 2021
@jyn514
Copy link
Member Author

jyn514 commented Apr 4, 2021

@bors rollup

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Apr 4, 2021
…k-Simulacrum

Add `download-rustc = "if-unchanged"`

This allows keeping the setting to a fixed value without having to
toggle it when you want to work on the compiler instead of on tools.

This sets `BOOTSTRAP_DOWNLOAD_RUSTC` in bootstrap.py so rustbuild doesn't have to try and replicate its logic.

Helps with rust-lang#81930.

r? `@Mark-Simulacrum` cc `@camelid`
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Apr 4, 2021
…k-Simulacrum

Add `download-rustc = "if-unchanged"`

This allows keeping the setting to a fixed value without having to
toggle it when you want to work on the compiler instead of on tools.

This sets `BOOTSTRAP_DOWNLOAD_RUSTC` in bootstrap.py so rustbuild doesn't have to try and replicate its logic.

Helps with rust-lang#81930.

r? ``@Mark-Simulacrum`` cc ``@camelid``
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 4, 2021
…k-Simulacrum

Add `download-rustc = "if-unchanged"`

This allows keeping the setting to a fixed value without having to
toggle it when you want to work on the compiler instead of on tools.

This sets `BOOTSTRAP_DOWNLOAD_RUSTC` in bootstrap.py so rustbuild doesn't have to try and replicate its logic.

Helps with rust-lang#81930.

r? ```@Mark-Simulacrum``` cc ```@camelid```
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Apr 4, 2021
…k-Simulacrum

Add `download-rustc = "if-unchanged"`

This allows keeping the setting to a fixed value without having to
toggle it when you want to work on the compiler instead of on tools.

This sets `BOOTSTRAP_DOWNLOAD_RUSTC` in bootstrap.py so rustbuild doesn't have to try and replicate its logic.

Helps with rust-lang#81930.

r? ````@Mark-Simulacrum```` cc ````@camelid````
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 5, 2021
…k-Simulacrum

Add `download-rustc = "if-unchanged"`

This allows keeping the setting to a fixed value without having to
toggle it when you want to work on the compiler instead of on tools.

This sets `BOOTSTRAP_DOWNLOAD_RUSTC` in bootstrap.py so rustbuild doesn't have to try and replicate its logic.

Helps with rust-lang#81930.

r? `````@Mark-Simulacrum````` cc `````@camelid`````
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 5, 2021
…k-Simulacrum

Add `download-rustc = "if-unchanged"`

This allows keeping the setting to a fixed value without having to
toggle it when you want to work on the compiler instead of on tools.

This sets `BOOTSTRAP_DOWNLOAD_RUSTC` in bootstrap.py so rustbuild doesn't have to try and replicate its logic.

Helps with rust-lang#81930.

r? ``````@Mark-Simulacrum`````` cc ``````@camelid``````
jyn514 pushed a commit to jyn514/rust that referenced this pull request Apr 5, 2021
…k-Simulacrum

Add `download-rustc = "if-unchanged"`

This allows keeping the setting to a fixed value without having to
toggle it when you want to work on the compiler instead of on tools.

This sets `BOOTSTRAP_DOWNLOAD_RUSTC` in bootstrap.py so rustbuild doesn't have to try and replicate its logic.

Helps with rust-lang#81930.

r? ```````@Mark-Simulacrum``````` cc ```````@camelid```````
@jyn514
Copy link
Member Author

jyn514 commented Apr 5, 2021

Err oops, this disallows download-rustc = true and forces download-rustc = "true".

running: /home/joshua/rustc2/build/bootstrap/debug/bootstrap doc compiler/rustc -v
failed to parse TOML configuration 'config.toml': invalid type: boolean `true`, expected a string for key `rust.download-rustc` at line 7 column 18

@jyn514
Copy link
Member Author

jyn514 commented Apr 5, 2021

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 5, 2021
This allows keeping the setting to a fixed value without having to
toggle it when you want to work on the compiler instead of on tools.
@jyn514 jyn514 force-pushed the download-if-unchanged branch from 7f5964a to 580a740 Compare April 5, 2021 13:46
@jyn514
Copy link
Member Author

jyn514 commented Apr 5, 2021

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Apr 5, 2021

📌 Commit 580a740 has been approved by Mark-Simulacrum

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 5, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 5, 2021
Rollup of 5 pull requests

Successful merges:

 - rust-lang#83368 (Add `download-rustc = "if-unchanged"`)
 - rust-lang#83705 (Give a better error when --theme is not a CSS file)
 - rust-lang#83853 (Disallow the use of high byte registes as operands on x86_64)
 - rust-lang#83877 (Remove unnecessary exceptions to the platform-specific code check)
 - rust-lang#83878 (Fix racing file access in tidy)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 335a3c4 into rust-lang:master Apr 5, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 5, 2021
@jyn514 jyn514 deleted the download-if-unchanged branch April 5, 2021 17:04
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 5, 2021
Add `x.py setup tools` which enables `download-rustc` by default

Helps with rust-lang#81930. I know I said in that issue that I should fix that rebasing rebuilds bootstrap, but the compile time improvement is so good I think it's ok to leave that fix for later (I still plan to work on it). I think all the outright bugs have been fixed :)

This builds on rust-lang#83368 so I can set the option to `if-unchanged`.

r? `@Mark-Simulacrum`
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 5, 2021
Add `x.py setup tools` which enables `download-rustc` by default

Helps with rust-lang#81930. I know I said in that issue that I should fix that rebasing rebuilds bootstrap, but the compile time improvement is so good I think it's ok to leave that fix for later (I still plan to work on it). I think all the outright bugs have been fixed :)

This builds on rust-lang#83368 so I can set the option to `if-unchanged`.

r? ``@Mark-Simulacrum``
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Apr 5, 2021
Add `x.py setup tools` which enables `download-rustc` by default

Helps with rust-lang#81930. I know I said in that issue that I should fix that rebasing rebuilds bootstrap, but the compile time improvement is so good I think it's ok to leave that fix for later (I still plan to work on it). I think all the outright bugs have been fixed :)

This builds on rust-lang#83368 so I can set the option to `if-unchanged`.

r? ```@Mark-Simulacrum```
@jyn514 jyn514 added the A-download-rustc Area: The `rust.download-rustc` build option. label Jun 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-contributor-roadblock Area: Makes things more difficult for new or seasoned contributors to Rust A-download-rustc Area: The `rust.download-rustc` build option. C-enhancement Category: An issue proposing an enhancement or a PR with one. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants