diff options
| author | Michael Goulet <michael@errs.io> | 2022-05-06 20:49:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-06 20:49:34 -0700 |
| commit | 0f1c067aecd38c7653500b22051122479c7b2aa3 (patch) | |
| tree | 5eb8e1e0de6e591f8cdb91bac7065ffddd241fac | |
| parent | 825dc80d1a056d57fd136a448609bb2beb0be5fd (diff) | |
| parent | 80087b98ccea66b0734c514b97014399b5100255 (diff) | |
| download | rust-0f1c067aecd38c7653500b22051122479c7b2aa3.tar.gz rust-0f1c067aecd38c7653500b22051122479c7b2aa3.zip | |
Rollup merge of #96758 - davidtwco:split-debuginfo-bootstrap-bsd, r=Mark-Simulacrum
bootstrap: bsd platform flags for split debuginfo Addresses https://github.com/rust-lang/rust/pull/96597#issuecomment-1118905025. 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`
| -rw-r--r-- | src/bootstrap/builder.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index d8a41912ff7..fe60c6da92b 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -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 { |