Skip to content

bootstrap: use same make flags with rustdoc #119292

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.

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

Merged
merged 1 commit into from
Dec 25, 2023

Conversation

onur-ozkan
Copy link
Member

Keeping same MAKEFLAGS and MFLAGS for rustdoc should allow rustdoc to use the same jobserver.

Keeping same `MAKEFLAGS` and `MFLAGS` for rustdoc
should allow rustdoc to use the same jobserver.

Signed-off-by: onur-ozkan <[email protected]>
@rustbot
Copy link
Collaborator

rustbot commented Dec 25, 2023

r? @albertlarsan68

(rustbot has picked a reviewer for you, use r? to override)

@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 Dec 25, 2023
@onur-ozkan
Copy link
Member Author

@bors rollup=iffy

@@ -1221,11 +1221,6 @@ impl<'a> Builder<'a> {
cmd.arg("-Dwarnings");
}
cmd.arg("-Znormalize-docs");

// Remove make-related flags that can cause jobserver problems.
Copy link
Member Author

Choose a reason for hiding this comment

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

This was a temporary fix applied 5 years ago. Let's see if still happens.

@albertlarsan68
Copy link
Member

Thanks for the PR!
@bors r+

@bors
Copy link
Collaborator

bors commented Dec 25, 2023

📌 Commit c350d3c has been approved by albertlarsan68

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 Dec 25, 2023
@bors
Copy link
Collaborator

bors commented Dec 25, 2023

⌛ Testing commit c350d3c with merge 13ea97c...

@bors
Copy link
Collaborator

bors commented Dec 25, 2023

☀️ Test successful - checks-actions
Approved by: albertlarsan68
Pushing 13ea97c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 25, 2023
@bors bors merged commit 13ea97c into rust-lang:master Dec 25, 2023
@rustbot rustbot added this to the 1.77.0 milestone Dec 25, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (13ea97c): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.9% [1.6%, 2.3%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 669.882s -> 667.944s (-0.29%)
Artifact size: 312.63 MiB -> 312.62 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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