Skip to content

Conversation

onur-ozkan
Copy link
Contributor

When using download-rustc, using stage 1 rustdoc results in the wrong librustc_driver being used.

$ ./build/host/stage1/bin/rustdoc --version
./build/host/stage1/bin/rustdoc: error while loading shared libraries: librustc_driver-7ff02ed05016d515.so: cannot open shared object file: No such file or directory

This change fixes that by not cutting the stage if download-rustc is enabled.

@rustbot
Copy link
Collaborator

rustbot commented Jun 20, 2024

r? @clubby789

rustbot has assigned @clubby789.
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 Jun 20, 2024
When using download-rustc, using stage 1 rustdoc results in the wrong librustc_driver being used.

```sh
$ ./build/host/stage1/bin/rustdoc --version
./build/host/stage1/bin/rustdoc: error while loading shared libraries: librustc_driver-7ff02ed05016d515.so: cannot open shared object file: No such file or directory
```

This change fixes that by not cutting the stage if download-rustc is enabled.

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

This is blocker for #122709.

@Kobzol
Copy link
Member

Kobzol commented Jun 27, 2024

r? @Kobzol

@rustbot rustbot assigned Kobzol and unassigned clubby789 Jun 27, 2024
@Kobzol
Copy link
Member

Kobzol commented Jun 27, 2024

Confirmed that this fixes ./x build --stage 1 rustdoc with download-rustc = true.

We have discussed that rustdoc could eventually become a part of download-rustc = true, but this is useful as a fix in the meantime.

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 27, 2024

📌 Commit 08fa5f0 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 Jun 27, 2024
@bors
Copy link
Collaborator

bors commented Jun 27, 2024

⌛ Testing commit 08fa5f0 with merge a4ce33c...

@bors
Copy link
Collaborator

bors commented Jun 27, 2024

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing a4ce33c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 27, 2024
@bors bors merged commit a4ce33c into rust-lang:master Jun 27, 2024
@rustbot rustbot added this to the 1.81.0 milestone Jun 27, 2024
@onur-ozkan onur-ozkan deleted the stage1-rustdoc branch June 27, 2024 12:33
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a4ce33c): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-8.0% [-8.0%, -8.0%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

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

Cycles

Results (primary -0.8%)

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)
- - 0
Improvements ✅
(primary)
-0.8% [-0.8%, -0.8%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.8% [-0.8%, -0.8%] 1

Binary size

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

Bootstrap: 695.971s -> 696.635s (0.10%)
Artifact size: 326.67 MiB -> 326.80 MiB (0.04%)

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.

6 participants