-
Notifications
You must be signed in to change notification settings - Fork 13.4k
resolve target-libdir directly from rustc #141729
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
+26
−10
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jieyouxu
approved these changes
May 29, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, r=me if reporter confirms it fixes the problem for them
This patch solves #141722 Many thanks! |
@bors r+ rollup |
Leaving stage0 target-libdir resolution to rustc. This should also fix the issue with hard-coding `$sysroot/lib` which fails on systems that use `$sysroot/lib64` or `$sysroot/lib32`. Signed-off-by: onur-ozkan <work@onurozkan.dev>
I forgot to @bors r- |
@bors r=jieyouxu |
bors
added a commit
that referenced
this pull request
May 29, 2025
…r=<try> resolve stage0 sysroot from rustc Similar to #141729, instead of manually navigating directories based on stage0 rustc, use `--print sysroot` to get the sysroot directly. This also works when using the bootstrap `rustc` shim. r? Kobzol
bors
added a commit
that referenced
this pull request
May 29, 2025
Rollup of 11 pull requests Successful merges: - #137574 (Make `std/src/num` mirror `core/src/num`) - #141384 (Enable review queue tracking) - #141448 (A variety of improvements to the codegen backends) - #141636 (avoid some usages of `&mut P<T>` in AST visitors) - #141676 (float: Disable `total_cmp` sNaN tests for `f16`) - #141705 (Add eslint as part of `tidy` run) - #141715 (Add `loongarch64` with `d` feature to `f32::midpoint` fast path) - #141723 (Provide secrets to try builds with new bors) - #141728 (Fix false documentation of FnCtxt::diverges) - #141729 (resolve target-libdir directly from rustc) - #141732 (creader: Remove extraenous String::clone) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
that referenced
this pull request
May 29, 2025
Rollup of 11 pull requests Successful merges: - #137574 (Make `std/src/num` mirror `core/src/num`) - #141384 (Enable review queue tracking) - #141448 (A variety of improvements to the codegen backends) - #141636 (avoid some usages of `&mut P<T>` in AST visitors) - #141676 (float: Disable `total_cmp` sNaN tests for `f16`) - #141705 (Add eslint as part of `tidy` run) - #141715 (Add `loongarch64` with `d` feature to `f32::midpoint` fast path) - #141723 (Provide secrets to try builds with new bors) - #141728 (Fix false documentation of FnCtxt::diverges) - #141729 (resolve target-libdir directly from rustc) - #141732 (creader: Remove extraenous String::clone) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
May 30, 2025
Rollup merge of #141729 - onur-ozkan:fix-141722, r=jieyouxu resolve target-libdir directly from rustc Leaving stage0 target-libdir resolution to rustc. This should also fix the issue with hard-coding `$sysroot/lib` which fails on systems that use `$sysroot/lib64` or `$sysroot/lib32`. Haven't tested, but should fix #141722
bors
added a commit
that referenced
this pull request
May 30, 2025
…r=<try> resolve stage0 sysroot from rustc Similar to #141729, instead of manually navigating directories based on stage0 rustc, use `--print sysroot` to get the sysroot directly. This also works when using the bootstrap `rustc` shim. r? Kobzol
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
May 30, 2025
…rom-rustc, r=Kobzol resolve stage0 sysroot from rustc Similar to rust-lang#141729, instead of manually navigating directories based on stage0 rustc, use `--print sysroot` to get the sysroot directly. This also works when using the bootstrap `rustc` shim. r? Kobzol
rust-timer
added a commit
that referenced
this pull request
May 30, 2025
Rollup merge of #141736 - onur-ozkan:resolve-stage0-syroot-from-rustc, r=Kobzol resolve stage0 sysroot from rustc Similar to #141729, instead of manually navigating directories based on stage0 rustc, use `--print sysroot` to get the sysroot directly. This also works when using the bootstrap `rustc` shim. r? Kobzol
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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)
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Leaving stage0 target-libdir resolution to rustc. This should also fix the issue with hard-coding
$sysroot/lib
which fails on systems that use$sysroot/lib64
or$sysroot/lib32
.Haven't tested, but should fix #141722