diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-12-03 07:48:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-03 07:48:31 +0100 |
| commit | 481ca6166f9985f3519632a16ba59ecebc19d9a7 (patch) | |
| tree | 258cb454da9d2539c46405c6603dcc5653ba0fb0 /compiler/rustc_codegen_gcc | |
| parent | 41cbe3e4d1ef8de310fbbd77043082960def9446 (diff) | |
| parent | 7610aa55590575671d203aa5afa8c27ab73fcf3a (diff) | |
| download | rust-481ca6166f9985f3519632a16ba59ecebc19d9a7.tar.gz rust-481ca6166f9985f3519632a16ba59ecebc19d9a7.zip | |
Rollup merge of #132723 - jieyouxu:sysroot-dance-dance-revolution, r=onur-ozkan
Unify `sysroot_target_{bin,lib}dir` handling
Follow-up to https://github.com/rust-lang/rust/pull/131405#discussion_r1826558962 where `sysroot_target_bindir` had to do some dancing because the sysroot ensure logic embedded in `sysroot_target_libdir` returned `$sysroot/$relative_lib/rustlib/$target/lib` and not the `rustlib` parent `$sysroot/$relative_lib/rustlib/`.
This PR pulls out the sysroot ensure logic into a helper, and return `$sysroot/$relative_lib/rustlib/` instead so `sysroot_target_bindir` doesn't have to do parent traversal from the path returned from `sysroot_target_libdir`, and also make them easier to follow in that they are now clearly closely related based on the common target sysroot ensure logic.
Diffstat (limited to 'compiler/rustc_codegen_gcc')
0 files changed, 0 insertions, 0 deletions