diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-01-20 20:58:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-20 20:58:35 +0100 |
| commit | c8c5fa4893a6835ca8e799539e4315b4261261c0 (patch) | |
| tree | 70e67a81fb2b6b5428e3b6297acde88ef209947f /compiler/rustc_session/src | |
| parent | bbec1510bbdd3363a02f3e42291c7efa9c439735 (diff) | |
| parent | 056a9cebe97b52e5da1e35ba98d56050c5fc4a7a (diff) | |
| download | rust-c8c5fa4893a6835ca8e799539e4315b4261261c0.tar.gz rust-c8c5fa4893a6835ca8e799539e4315b4261261c0.zip | |
Rollup merge of #135330 - bjorn3:respect_sysroot_in_version_printing, r=lqd
Respect --sysroot for rustc -vV and -Cpasses=list This is necessary when the specified codegen backend is in a custom sysroot. Fixes https://github.com/rust-lang/rust/issues/135165
Diffstat (limited to 'compiler/rustc_session/src')
| -rw-r--r-- | compiler/rustc_session/src/config.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs index 3d2042952b3..59c0f8cfb87 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs @@ -1346,8 +1346,12 @@ pub fn build_configuration(sess: &Session, mut user_cfg: Cfg) -> Cfg { user_cfg } -pub fn build_target_config(early_dcx: &EarlyDiagCtxt, opts: &Options, sysroot: &Path) -> Target { - match Target::search(&opts.target_triple, sysroot) { +pub fn build_target_config( + early_dcx: &EarlyDiagCtxt, + target: &TargetTuple, + sysroot: &Path, +) -> Target { + match Target::search(target, sysroot) { Ok((target, warnings)) => { for warning in warnings.warning_messages() { early_dcx.early_warn(warning) |