Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

handle stage0 cargo and rustc separately #129459

Merged
merged 1 commit into from
Aug 25, 2024
Merged

handle stage0 cargo and rustc separately #129459

merged 1 commit into from
Aug 25, 2024

Conversation

onur-ozkan
Copy link
Member

This change allows setting either build.cargo or build.rustc without requiring both to be set simultaneously, which was not possible previously.

To try it, set build.rustc without setting build.cargo, and try to bootstrap on clean build.

Blocker for #129152

@rustbot
Copy link
Collaborator

rustbot commented Aug 23, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Aug 23, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
Kobzol
Kobzol reviewed Aug 23, 2024
View reviewed changes
src/bootstrap/bootstrap.py Outdated Show resolved Hide resolved
@onur-ozkan onur-ozkan force-pushed the separate-stage0-bins branch 2 times, most recently from 569e0e1 to 5f2cedc Compare August 23, 2024 12:34
@onur-ozkan
handle stage0 cargo and rustc separately
5f2cedc 
This change allows setting either `build.cargo` or `build.rustc` without requiring
both to be set simultaneously, which was not possible previously.

To try it, set `build.rustc` without setting `build.cargo`, and try to bootstrap on clean build.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@Kobzol
Copy link
Contributor

Kobzol commented Aug 23, 2024

You can r=me once CI is green.

@onur-ozkan
Copy link
Member Author

@bors r=Kobzol

@bors
Copy link
Contributor

bors commented Aug 23, 2024

📌 Commit 5f2cedc has been approved by Kobzol

It is now in the queue for this repository.

@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 23, 2024
tgross35 added a commit to tgross35/rust that referenced this pull request Aug 25, 2024
@tgross35
Rollup merge of rust-lang#129459 - onur-ozkan:separate-stage0-bins, r…
1e038c5 
…=Kobzol

handle stage0 `cargo` and `rustc` separately

This change allows setting either `build.cargo` or `build.rustc` without requiring both to be set simultaneously, which was not possible previously.

To try it, set `build.rustc` without setting `build.cargo`, and try to bootstrap on clean build.

Blocker for rust-lang#129152
@tgross35 tgross35 mentioned this pull request Aug 25, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
@bors
Auto merge of rust-lang#129547 - tgross35:rollup-3lihvog, r=tgross35
67dfa4c 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#126985 (Implement `-Z embed-source` (DWARFv5 source code embedding extension))
 - rust-lang#128935 (More work on `zstd` compression)
 - rust-lang#129134 (bootstrap: improve error recovery flags to curl)
 - rust-lang#129190 (Add f16 and f128 to tests/ui/consts/const-float-bits-conv.rs)
 - rust-lang#129416 (library: Move unstable API of new_uninit to new features)
 - rust-lang#129418 (rustc: Simplify getting sysroot library directory)
 - rust-lang#129459 (handle stage0 `cargo` and `rustc` separately)
 - rust-lang#129511 (Update minifier to 0.3.1)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 25, 2024
@matthiaskrgr
Rollup merge of rust-lang#129459 - onur-ozkan:separate-stage0-bins, r…
e84f97a 
…=Kobzol

handle stage0 `cargo` and `rustc` separately

This change allows setting either `build.cargo` or `build.rustc` without requiring both to be set simultaneously, which was not possible previously.

To try it, set `build.rustc` without setting `build.cargo`, and try to bootstrap on clean build.

Blocker for rust-lang#129152
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 25, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
@bors
Auto merge of rust-lang#129554 - matthiaskrgr:rollup-thle4kd, r=matth…
2314ed4 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128919 (Add an internal lint that warns when accessing untracked data)
 - rust-lang#129134 (bootstrap: improve error recovery flags to curl)
 - rust-lang#129416 (library: Move unstable API of new_uninit to new features)
 - rust-lang#129459 (handle stage0 `cargo` and `rustc` separately)
 - rust-lang#129487 (repr_transparent_external_private_fields: special-case some std types)
 - rust-lang#129511 (Update minifier to 0.3.1)
 - rust-lang#129523 (Make `rustc_type_ir` build on stable)
 - rust-lang#129546 (Get rid of `predicates_defined_on`)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 25, 2024
@matthiaskrgr
Rollup merge of rust-lang#129459 - onur-ozkan:separate-stage0-bins, r…
52ea214 
…=Kobzol

handle stage0 `cargo` and `rustc` separately

This change allows setting either `build.cargo` or `build.rustc` without requiring both to be set simultaneously, which was not possible previously.

To try it, set `build.rustc` without setting `build.cargo`, and try to bootstrap on clean build.

Blocker for rust-lang#129152
This was referenced Aug 25, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
@bors
Auto merge of rust-lang#129563 - matthiaskrgr:rollup-t6bai2d, r=matth…
705176d 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#129091 (add Box::as_ptr and Box::as_mut_ptr methods)
 - rust-lang#129134 (bootstrap: improve error recovery flags to curl)
 - rust-lang#129416 (library: Move unstable API of new_uninit to new features)
 - rust-lang#129459 (handle stage0 `cargo` and `rustc` separately)
 - rust-lang#129487 (repr_transparent_external_private_fields: special-case some std types)
 - rust-lang#129511 (Update minifier to 0.3.1)
 - rust-lang#129523 (Make `rustc_type_ir` build on stable)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
@bors
Auto merge of rust-lang#129563 - matthiaskrgr:rollup-t6bai2d, r=matth…
c6db1ca 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#129091 (add Box::as_ptr and Box::as_mut_ptr methods)
 - rust-lang#129134 (bootstrap: improve error recovery flags to curl)
 - rust-lang#129416 (library: Move unstable API of new_uninit to new features)
 - rust-lang#129459 (handle stage0 `cargo` and `rustc` separately)
 - rust-lang#129487 (repr_transparent_external_private_fields: special-case some std types)
 - rust-lang#129511 (Update minifier to 0.3.1)
 - rust-lang#129523 (Make `rustc_type_ir` build on stable)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a44e5a9 into rust-lang:master Aug 25, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 25, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
@rust-timer
Unrolled build for rust-lang#129459
31d20ef 
Rollup merge of rust-lang#129459 - onur-ozkan:separate-stage0-bins, r=Kobzol

handle stage0 `cargo` and `rustc` separately

This change allows setting either `build.cargo` or `build.rustc` without requiring both to be set simultaneously, which was not possible previously.

To try it, set `build.rustc` without setting `build.cargo`, and try to bootstrap on clean build.

Blocker for rust-lang#129152
@onur-ozkan onur-ozkan deleted the separate-stage0-bins branch August 26, 2024 05:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kobzol Kobzol Kobzol left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
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
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.
6 participants
@onur-ozkan @rustbot @rust-log-analyzer @Kobzol @bors @Mark-Simulacrum