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

x.py build no longer places rustc and rustdoc binaries into stage2/ with config profile = "tools" #103206

Closed
fmease opened this issue Oct 18, 2022 · 9 comments · Fixed by #104076
Closed

x.py build no longer places rustc and rustdoc binaries into stage2/ with config profile = "tools" #103206

fmease opened this issue Oct 18, 2022 · 9 comments · Fixed by #104076
Assignees
@onur-ozkan
Labels
A-contributor-roadblock Area: Makes things more difficult for new contributors to rust itself C-bug Category: This is a bug. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Comments

@fmease
Copy link
Member

fmease commented Oct 18, 2022 •
edited by rustbot
Loading

./x.py b with profile = "tools" in config.toml no longer places rustc & rustdoc into build/$TARGET/stage2/bin/ but just into build/$TARGET/ci-rustc-sysroot/bin/.
Tested on Linux.

Zulip discussion.

@rustbot label T-infra A-bootstrap A-contributor-roadblock
@fmease fmease added the C-bug Category: This is a bug. label Oct 18, 2022
@rustbot rustbot added 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 contributors to rust itself T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Oct 18, 2022
@jyn514
Copy link
Member

jyn514 commented Oct 18, 2022

I'm not convinced the binaries in ci-rustc-sysroot are actually the newly compiled binaries; I think they may just never be copied from stage1-tools-bin into a sysroot.

@fmease
Copy link
Member Author

fmease commented Oct 19, 2022

I'm not convinced the binaries in ci-rustc-sysroot are actually the newly compiled binaries

I am not familiar enough with the bootstrap process to be able to confirm or dispute this.
As far as I'm concerned, I've relinked my rustup toolchain stage2 to ci-rustc-sysroot and everything appears to work flawlessly.

@jyn514
Copy link
Member

jyn514 commented Oct 19, 2022 •
edited
Loading

@fmease can you post the output of rustc +stage2 --version and rustdoc +stage2 --version?

@fmease
Copy link
Member Author

fmease commented Oct 19, 2022 •
edited
Loading 

rustc 1.66.0-nightly (e94827e5b 2022-10-18)
rustdoc 1.66.0-nightly (e94827e5b 2022-10-18)

@jyn514
Copy link
Member

jyn514 commented Oct 19, 2022 •
edited
Loading

yeah that looks like it's not actually reflecting your changes, just using the latest nightly unmodified

If it were working properly it would say -dev

@fmease
Copy link
Member Author

fmease commented Oct 19, 2022

Hmm, that can't be. I am currently working on fixing #24183 and modifications to the rustdoc source code are indeed properly reflected in the compiled binaries. Maybe the version string is just wrong but my local changes are picked up.

@fmease
Copy link
Member Author

fmease commented Oct 19, 2022 •
edited
Loading

Actually, I have a counterquestion. Can you by chance reproduce this? Or is it just me and @aDotInTheVoid? I'm just wondering why more people haven't stumbled upon this issue.

@onur-ozkan
Copy link
Member

@rustbot claim

@onur-ozkan onur-ozkan mentioned this issue Nov 6, 2022
Merged
@jyn514
Copy link
Member

jyn514 commented Nov 9, 2022

cc #102025

@jyn514 jyn514 mentioned this issue Nov 9, 2022
Merged
Manishearth added a commit to Manishearth/rust that referenced this issue Nov 9, 2022
@Manishearth
Rollup merge of rust-lang#104184 - jyn514:rustdoc-version, r=davidtwco
aed1890 
Fix `rustdoc --version` when used with download-rustc

Previously, rustdoc would unconditionally report the version that *rustc* was compiled with. That showed things like `nightly-2022-10-30`, which wasn't right, since this was a `dev` build compiled from source.

Fix it by changing `rustc_driver::version` to a macro expanded at invocation time.

cc rust-lang#103206 (comment)
Manishearth added a commit to Manishearth/rust that referenced this issue Nov 9, 2022
@Manishearth
Rollup merge of rust-lang#104184 - jyn514:rustdoc-version, r=davidtwco
4293f9a 
Fix `rustdoc --version` when used with download-rustc

Previously, rustdoc would unconditionally report the version that *rustc* was compiled with. That showed things like `nightly-2022-10-30`, which wasn't right, since this was a `dev` build compiled from source.

Fix it by changing `rustc_driver::version` to a macro expanded at invocation time.

cc rust-lang#103206 (comment)
Manishearth added a commit to Manishearth/rust that referenced this issue Nov 9, 2022
@Manishearth
Rollup merge of rust-lang#104184 - jyn514:rustdoc-version, r=davidtwco
70c04a2 
Fix `rustdoc --version` when used with download-rustc

Previously, rustdoc would unconditionally report the version that *rustc* was compiled with. That showed things like `nightly-2022-10-30`, which wasn't right, since this was a `dev` build compiled from source.

Fix it by changing `rustc_driver::version` to a macro expanded at invocation time.

cc rust-lang#103206 (comment)
@bors bors closed this as completed in d6298d3 Nov 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@onur-ozkan onur-ozkan

Labels
A-contributor-roadblock Area: Makes things more difficult for new contributors to rust itself C-bug Category: This is a bug. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

fix sysroot issue which appears for ci downloaded rustc onur-ozkan/rust
4 participants
@fmease @jyn514 @onur-ozkan @rustbot