Skip to content

Commit

Permalink
Set DebuginfoKind::Pdb in msvc_base
Browse files Browse the repository at this point in the history
This PDB setting was added to `windows_msvc_base` in
rust-lang#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 rust-lang#101071
  • Loading branch information
nicholasbishop committed Aug 27, 2022
1 parent 3b3f3b7 commit 1dd47b0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/msvc_base.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::spec::{LinkerFlavor, LldFlavor, SplitDebuginfo, TargetOptions};
use crate::spec::{DebuginfoKind, LinkerFlavor, LldFlavor, SplitDebuginfo, TargetOptions};
use std::borrow::Cow;

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

..Default::default()
}
Expand Down
3 changes: 1 addition & 2 deletions compiler/rustc_target/src/spec/windows_msvc_base.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::spec::{cvs, DebuginfoKind, TargetOptions};
use crate::spec::{cvs, TargetOptions};

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

..base
}
Expand Down

0 comments on commit 1dd47b0

Please sign in to comment.