Cleanup sysroot locating a bit #138404
Merged
Cleanup sysroot locating a bit #138404
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
rustbot
added
A-translation
|
Some changes occurred in compiler/rustc_codegen_ssa
|
This comment has been minimized.
This comment has been minimized.
bjorn3
force-pushed
the
sysroot_handling_cleanup
branch
from
4958015 to
c61439c
Compare
petrochenkov
approved these changes
Mar 12, 2025
|
I was complaining about this in #129418, but only did one step of the cleanup. |
|
r=me unless jieyouxu wants to look. |
bjorn3
commented
Mar 12, 2025
| @@ -1214,7 +1214,7 @@ impl Default for Options { | |||
| describe_lints: false, | |||
| output_types: OutputTypes(BTreeMap::new()), | |||
| search_paths: vec![], | |||
| maybe_sysroot: None, | |||
| sysroot: filesearch::materialize_sysroot(None), | |||
There was a problem hiding this comment.
Maybe this should use PathBuf::new()? It is only used for tests.
This comment has been minimized.
This comment has been minimized.
bjorn3
force-pushed
the
sysroot_handling_cleanup
branch
from
5c2c5df to
bdc7041
Compare
|
Fixed rustdoc and added a commit to remove the unused host_tlib_path field. |
This comment has been minimized.
This comment has been minimized.
build_session_options always uses materialize_sysroot anyway.
All callers unwrap the result.
bjorn3
force-pushed
the
sysroot_handling_cleanup
branch
from
bdc7041 to
1543256
Compare
|
Seems fine to me as well, thanks! @bors r=petrochenkov,jieyouxu |
bors
removed
the
S-waiting-on-review
bors
added
the
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 13, 2025
…=petrochenkov,jieyouxu Cleanup sysroot locating a bit All commits should preserve existing behavior.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 13, 2025
…=petrochenkov,jieyouxu Cleanup sysroot locating a bit All commits should preserve existing behavior.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 13, 2025
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#137816 (attempt to support `BinaryFormat::Xcoff` in `naked_asm!`) - rust-lang#138109 (make precise capturing args in rustdoc Json typed) - rust-lang#138343 (Enable `f16` tests for `powf`) - rust-lang#138356 (bump libc to 0.2.171 to fix xous) - rust-lang#138371 (Update compiletest's `has_asm_support` to match rustc) - rust-lang#138380 (ci: add runners for vanilla LLVM 20) - rust-lang#138404 (Cleanup sysroot locating a bit) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 13, 2025
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#137816 (attempt to support `BinaryFormat::Xcoff` in `naked_asm!`) - rust-lang#138109 (make precise capturing args in rustdoc Json typed) - rust-lang#138343 (Enable `f16` tests for `powf`) - rust-lang#138356 (bump libc to 0.2.171 to fix xous) - rust-lang#138371 (Update compiletest's `has_asm_support` to match rustc) - rust-lang#138404 (Cleanup sysroot locating a bit) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 13, 2025
Rollup merge of rust-lang#138404 - bjorn3:sysroot_handling_cleanup, r=petrochenkov,jieyouxu Cleanup sysroot locating a bit All commits should preserve existing behavior.
github-actions bot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
Mar 14, 2025
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#137816 (attempt to support `BinaryFormat::Xcoff` in `naked_asm!`) - rust-lang#138109 (make precise capturing args in rustdoc Json typed) - rust-lang#138343 (Enable `f16` tests for `powf`) - rust-lang#138356 (bump libc to 0.2.171 to fix xous) - rust-lang#138371 (Update compiletest's `has_asm_support` to match rustc) - rust-lang#138404 (Cleanup sysroot locating a bit) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
All commits should preserve existing behavior.