improve `filesearch::get_or_default_sysroot` #103660

onur-ozkan · 2022-10-27T23:46:00Z

fn get_or_default_sysroot is now improved and used in miri and clippy, and tests are still passing as they should. So we no longer need to implement custom workarounds/hacks to find sysroot in tools like miri/clippy.

Resolves #98832

re-opened from #103581

rustbot · 2022-10-27T23:46:08Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nagisa (or someone else) soon.

Please see the contribution instructions for more information.

rustbot · 2022-10-27T23:46:11Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

The Miri subtree was changed

cc @rust-lang/miri

jyn514 · 2022-10-28T00:07:49Z

r? @jyn514

@ozkanonur if you remove the last commit ("merge branch master") we can merge this:)

onur-ozkan · 2022-10-28T00:19:41Z

r? @jyn514

@ozkanonur if you remove the last commit ("merge branch master") we can merge this:)

It was conflict resolving commit. Rollbacked it.

jyn514 · 2022-10-28T01:41:52Z

Try using https://rustc-dev-guide.rust-lang.org/git.html#rebasing-and-conflicts to resolve the conflicts.

jyn514 · 2022-10-28T15:05:10Z

@bors r+

bors · 2022-10-28T15:05:12Z

📌 Commit ae0232e has been approved by jyn514

It is now in the queue for this repository.

improve `filesearch::get_or_default_sysroot` `fn get_or_default_sysroot` is now improved and used in `miri` and `clippy`, and tests are still passing as they should. So we no longer need to implement custom workarounds/hacks to find sysroot in tools like miri/clippy. Resolves rust-lang#98832 re-opened from rust-lang#103581

Signed-off-by: Onur Özkan <[email protected]>

onur-ozkan · 2022-11-04T19:59:10Z

@bors r+

A reminder, PR popped-off from the merge queue after windows compatibility fix(I tested it).

jyn514 · 2022-11-04T20:21:42Z

Hmm, I don't actually see any changes since the failed rollup? both the force pushes say "no changes to compare"

onur-ozkan · 2022-11-04T20:28:19Z

Hmm, I don't actually see any changes since the failed rollup? both the force pushes say "no changes to compare"

Here is the change for win compatibility fix f1b11b39940bda3e37d2c3a588f1baba27e6bb59

and 9e06962018506edc185ddc48eb30cc95dd81aa3f for fixing fmt error.

At the end, commits squashed and pushed with improve filesearch::get_or_default_sysroot message

jyn514 · 2022-11-04T20:39:12Z

Thanks :)

@bors r+

Upstream change: rust-lang/rust#103660 Reference: nix-community/fenix#91

flip1995 · 2022-11-19T21:39:21Z

This no longer takes the SYSROOT env var into account. At least not for clippy-driver, and with that makes Clippy CI fail: https://github.com/rust-lang/rust-clippy/actions/runs/3505195043/jobs/5871355206#step:12:22

This no longer works to set the SYSROOT:

$ SYSROOT=/path/to/sysroot ./target/debug/clippy-driver --print sysroot

Is this intentional? @ozkanonur @jyn514 (Sorry for reporting this so late. The sync was blocked for so long, partly because I didn't have time to deal with it)

onur-ozkan · 2022-11-19T21:55:50Z

This no longer takes the SYSROOT env var into account. At least not for clippy-driver, and with that makes Clippy CI fail: https://github.com/rust-lang/rust-clippy/actions/runs/3505195043/jobs/5871355206#step:12:22

This no longer works to set the SYSROOT:
$ SYSROOT=/path/to/sysroot ./target/debug/clippy-driver --print sysroot
Is this intentional? @ozkanonur @jyn514 (Sorry for reporting this so late. The sync was blocked for so long, partly because I didn't have time to deal with it)

I think I should have leave it supported(like miri's MIRI_SYSROOT). So, it might be unintentional. But it's better to wait Joshua's answer since I am pretty newbie on this project. :)

I can open the fix PR if needed(depending on the answer from Joshua).

RalfJung · 2022-11-19T22:34:49Z

Miri still has this logic for that purpose -- maybe the equivalent in clippy got accidentally deleted in this PR. (A bit surprising that rustc CI would pass then though since it checks clippy?)

onur-ozkan · 2022-11-19T22:39:46Z

Miri still has this logic for that purpose -- maybe the equivalent in clippy got accidentally deleted in this PR. (A bit surprising that rustc CI would pass then though since it checks clippy?)

I guess we should also implement a test that checks this case then

flip1995 · 2022-11-19T23:05:34Z

Ah ok, yes this should also be implemented in Clippy. I will do that in the Sync PR on the Clippy side and then sync it back.

The CI didn't fail, because in the Rust repo some tests aren't run. One of them is our clippy-driver test. This is because changes like this should be done in the Clippy repo, rather than the Rust repo. In the Rust repo only fallout fixes should be done to the subtrees.

RalfJung · 2022-11-19T23:20:33Z

In the Rust repo only fallout fixes should be done to the subtrees.

This might be true for clippy but not all subtrees -- for Miri we run pretty much all tests and I do full feature development in the rutsc repo when needed (because rustc changes are required).

improve `filesearch::get_or_default_sysroot` `fn get_or_default_sysroot` is now improved and used in `miri` and `clippy`, and tests are still passing as they should. So we no longer need to implement custom workarounds/hacks to find sysroot in tools like miri/clippy. Resolves rust-lang#98832 re-opened from rust-lang#103581

jyn514 · 2022-11-26T23:06:40Z

@flip1995 @RalfJung can you please document both those policies? any of the following seem like good places:

(ideally) the ping message that shows up when the subtree is modified
the dev-guide
the README for your tool

Rust changed the way the SYSROOT is determined in: rust-lang/rust#103660 Before this change the SYSROOT was determined based on the rustc executable. Now it is determined based on the librustc_driver-*.so file. This pr fixes the detection by copying the library to the derivation as we have done it for the rustc executable.

improve `filesearch::get_or_default_sysroot` `fn get_or_default_sysroot` is now improved and used in `miri` and `clippy`, and tests are still passing as they should. So we no longer need to implement custom workarounds/hacks to find sysroot in tools like miri/clippy. Resolves rust-lang#98832 re-opened from rust-lang#103581

Rollup of 6 pull requests Successful merges: - rust-lang#103621 (Correctly resolve Inherent Associated Types) - rust-lang#103660 (improve `filesearch::get_or_default_sysroot`) - rust-lang#103866 (Remove some return-type diagnostic booleans from `FnCtxt`) - rust-lang#103867 (Remove `has_errors` from `FnCtxt`) - rust-lang#103994 (Specify that `break` cannot be used outside of loop *or* labeled block) - rust-lang#103995 (Small round of typo fixes) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Rust changed the way the SYSROOT is determined in: rust-lang/rust#103660 Before this change the SYSROOT was determined based on the rustc executable. Now it is determined based on the librustc_driver-*.so file. This pr fixes the detection by copying the library to the derivation as we have done it for the rustc executable.

… r=ozkanonur compiler/rustc_session: fix sysroot detection logic This pull request fixes the sysroot detection logic on systems where `/usr/lib` contains a multi-arch structure (e.g. installs `rustc_driver` into `/usr/lib/x86_64-linux-gnu` folder). This fixes a regression for various Linux systems introduced in rust-lang#103660. On Debian and Ubuntu systems, the logic in the pull request, as mentioned earlier, will resolve the sysroot to `/usr/lib`, making `rustc --print target-libdir` to return `/usr/lib/lib/rustlib/x86_64-unknown-linux-gnu/lib` (notice the extra `lib` at the beginning). The fix is not very "clean" according to the standard. If you have any suggestions on improving the logic, you are more than welcome to comment below!

rust-lang/rust#103660 makes this unnecessary. Closes #2

- Remove sysroot handling. Since rust-lang/rust#103660 this is detected automatically! - Update to a newer toolchain; in particular `install_ice_hook` has changed its signature. - Remove the wrapper code; it only matters for cargo plugins, but ubrustc only has an equivalent of clippy-driver, not cargo-clippy.

rustbot assigned nagisa Oct 27, 2022

rustbot assigned jyn514 and unassigned nagisa Oct 28, 2022

onur-ozkan force-pushed the master branch from 88ab918 to 01459f6 Compare October 28, 2022 00:18

onur-ozkan force-pushed the master branch from 01459f6 to ae0232e Compare October 28, 2022 07:24

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 Oct 28, 2022

Dylan-DPC mentioned this pull request Oct 28, 2022

Rollup of 6 pull requests #103696

Closed

Dylan-DPC mentioned this pull request Nov 3, 2022

Rollup of 6 pull requests #103923

Closed

onur-ozkan force-pushed the master branch from f1b11b3 to 524bd75 Compare November 4, 2022 13:46

improve filesearch::get_or_default_sysroot r=ozkanonur

71a3a48

Signed-off-by: Onur Özkan <[email protected]>

onur-ozkan force-pushed the master branch from 9e06962 to 71a3a48 Compare November 4, 2022 14:07

oxalica added a commit to oxalica/rust-overlay that referenced this pull request Nov 8, 2022

Workaround for new sysroot finding algorithm

be3a8a8

Upstream change: rust-lang/rust#103660 Reference: nix-community/fenix#91

flip1995 mentioned this pull request Nov 19, 2022

Rustup rust-lang/rust-clippy#9881

Merged

onur-ozkan mentioned this pull request Nov 19, 2022

pass clippy sysroot env if given #104619

Closed

jyn514 mentioned this pull request Nov 26, 2022

Document the policy for subtree changes #104962

Closed

bkchr mentioned this pull request Nov 30, 2022

Fix SYSROOT detection on latest nightly mozilla/nixpkgs-mozilla#299

Merged

bjorn3 mentioned this pull request Jan 18, 2023

probe_sysroot won't be necessary anymore starting rustc 1.67 Rust-for-Linux/klint#2

Closed

liushuyu mentioned this pull request Feb 23, 2023

compiler/rustc_session: fix sysroot detection logic #108376

Merged

This was referenced Feb 23, 2023

Fix for development shell MinaProtocol/mina#12692

Merged

rustc cannot determine correct SYSROOT for setups with shared components from sysroots NixOS/nixpkgs#217835

Open

nbdd0121 added a commit to Rust-for-Linux/klint that referenced this pull request Apr 20, 2023

Remove probe_sysroot

a482658

rust-lang/rust#103660 makes this unnecessary. Closes #2

bjorn3 mentioned this pull request May 16, 2023

Rustc_metadata cann't correctly find std crate if the linked binary launched not from /usr/bin #57196

Closed

jyn514 mentioned this pull request Jun 20, 2023

Greatly simplify the driver thomcc/ubrustc#1

Merged

thomcc mentioned this pull request Jun 21, 2023

Significantly simplify sysroot configuration tcdi/plrust#342

Merged

szlend mentioned this pull request Jul 2, 2023

Custom rust toolchains cachix/devenv#667

Merged

This was referenced Nov 30, 2023

[Bug]: cargo uitest fails with [E0463]: can't find crate for std rust-marker/marker#324

Closed

Rustc: Simplify --sysroot code after rust#103660 rust-marker/marker#325

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

improve `filesearch::get_or_default_sysroot` #103660

improve `filesearch::get_or_default_sysroot` #103660

onur-ozkan commented Oct 27, 2022

rustbot commented Oct 27, 2022

rustbot commented Oct 27, 2022

jyn514 commented Oct 28, 2022

onur-ozkan commented Oct 28, 2022

jyn514 commented Oct 28, 2022

jyn514 commented Oct 28, 2022

bors commented Oct 28, 2022

onur-ozkan commented Nov 4, 2022

jyn514 commented Nov 4, 2022

onur-ozkan commented Nov 4, 2022 •

edited

Loading

jyn514 commented Nov 4, 2022

flip1995 commented Nov 19, 2022 •

edited

Loading

onur-ozkan commented Nov 19, 2022 •

edited

Loading

RalfJung commented Nov 19, 2022

onur-ozkan commented Nov 19, 2022

flip1995 commented Nov 19, 2022

RalfJung commented Nov 19, 2022

jyn514 commented Nov 26, 2022

improve filesearch::get_or_default_sysroot #103660

improve filesearch::get_or_default_sysroot #103660

Conversation

onur-ozkan commented Oct 27, 2022

rustbot commented Oct 27, 2022

rustbot commented Oct 27, 2022

jyn514 commented Oct 28, 2022

onur-ozkan commented Oct 28, 2022

jyn514 commented Oct 28, 2022

jyn514 commented Oct 28, 2022

bors commented Oct 28, 2022

onur-ozkan commented Nov 4, 2022

jyn514 commented Nov 4, 2022

onur-ozkan commented Nov 4, 2022 • edited Loading

jyn514 commented Nov 4, 2022

flip1995 commented Nov 19, 2022 • edited Loading

onur-ozkan commented Nov 19, 2022 • edited Loading

RalfJung commented Nov 19, 2022

onur-ozkan commented Nov 19, 2022

flip1995 commented Nov 19, 2022

RalfJung commented Nov 19, 2022

jyn514 commented Nov 26, 2022

improve `filesearch::get_or_default_sysroot` #103660

improve `filesearch::get_or_default_sysroot` #103660

onur-ozkan commented Nov 4, 2022 •

edited

Loading

flip1995 commented Nov 19, 2022 •

edited

Loading

onur-ozkan commented Nov 19, 2022 •

edited

Loading