Skip to content

Commit 9642e48

Browse files
authored
Rollup merge of #101088 - nicholasbishop:bishop-uefi-pdb, r=davidtwco
Set DebuginfoKind::Pdb in msvc_base This PDB setting was added to `windows_msvc_base` in #98051. It's also needed for the UEFI targets, and since `uefi_msvc_base` and `windows_msvc_base` are the only things that inherit from `msvc_base`, just move the PDB setting up to `mscv_base` to cover both. Fixes #101071
2 parents 3de558d + 1dd47b0 commit 9642e48

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

compiler/rustc_target/src/spec/msvc_base.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{LinkerFlavor, LldFlavor, SplitDebuginfo, TargetOptions};
1+
use crate::spec::{DebuginfoKind, LinkerFlavor, LldFlavor, SplitDebuginfo, TargetOptions};
22
use std::borrow::Cow;
33

44
pub fn opts() -> TargetOptions {
@@ -20,6 +20,7 @@ pub fn opts() -> TargetOptions {
2020
// where `*.pdb` files show up next to the final artifact.
2121
split_debuginfo: SplitDebuginfo::Packed,
2222
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Packed]),
23+
debuginfo_kind: DebuginfoKind::Pdb,
2324

2425
..Default::default()
2526
}

compiler/rustc_target/src/spec/windows_msvc_base.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{cvs, DebuginfoKind, TargetOptions};
1+
use crate::spec::{cvs, TargetOptions};
22

33
pub fn opts() -> TargetOptions {
44
let base = super::msvc_base::opts();
@@ -28,7 +28,6 @@ pub fn opts() -> TargetOptions {
2828
// not ever be possible for us to pass this flag.
2929
no_default_libraries: false,
3030
has_thread_local: true,
31-
debuginfo_kind: DebuginfoKind::Pdb,
3231

3332
..base
3433
}

0 commit comments

Comments
 (0)