about summary refs log tree commit diff
path: root/library/std/src/sys/unix/stack_overflow.rs
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-03-01 01:21:56 +0100
committerGitHub <noreply@github.com>2023-03-01 01:21:56 +0100
commit0dfbce1bb06b510102f8df6e5e49a5705ba15153 (patch)
tree69c3c53074026312ab92a0a213ac4462aed56d9c /library/std/src/sys/unix/stack_overflow.rs
parent31f858d9a511f24fedb8ed997b28304fec809630 (diff)
parent2186358e5a124d486f55a20220f720fb8f9a0694 (diff)
downloadrust-0dfbce1bb06b510102f8df6e5e49a5705ba15153.tar.gz
rust-0dfbce1bb06b510102f8df6e5e49a5705ba15153.zip
Rollup merge of #108376 - liushuyu:fix-sysroot-infer-103660, 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 #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!
Diffstat (limited to 'library/std/src/sys/unix/stack_overflow.rs')
0 files changed, 0 insertions, 0 deletions