Skip to content

Commit

Permalink
Rollup merge of #96758 - davidtwco:split-debuginfo-bootstrap-bsd, r=M…
Browse files Browse the repository at this point in the history
…ark-Simulacrum

bootstrap: bsd platform flags for split debuginfo

Addresses #96597 (comment).

Bootstrap currently provides `-Zunstable-options` for OpenBSD when using split debuginfo - this commit provides it for all BSD targets.

We should probably work out a better way of handling the stability of the split debuginfo flag - all options for the flag are unstable but one of them is the default for each platform already.

cc `@m-ou-se`
r? `@Mark-Simulacrum`
  • Loading branch information
compiler-errors authored May 7, 2022
2 parents 825dc80 + 80087b9 commit 0f1c067
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1417,8 +1417,12 @@ impl<'a> Builder<'a> {
// FIXME(davidtwco): #[cfg(not(bootstrap))] - #95612 needs to be in the bootstrap compiler
// for this conditional to be removed.
if !target.contains("windows") || compiler.stage >= 1 {
if target.contains("linux") || target.contains("windows") || target.contains("openbsd")
{
let needs_unstable_opts = target.contains("linux")
|| target.contains("windows")
|| target.contains("bsd")
|| target.contains("dragonfly");

if needs_unstable_opts {
rustflags.arg("-Zunstable-options");
}
match self.config.rust_split_debuginfo {
Expand Down

0 comments on commit 0f1c067

Please sign in to comment.