Rollup merge of #45739 - rkarp:master, r=petrochenkov
Fix libstd compile error for windows-gnu targets without `backtrace`
This is basically an addition to #44979. Compiling `libstd` still fails when targeting `windows-gnu` with `panic = "abort"` because the items in the `...c::gnu` module are not used. They are only referenced from `backtrace_gnu.rs`, which is indirectly feature gated behind `backtrace` [here](9f3b09116b/src/libstd/sys/windows/mod.rs (L23)
).
This commit is contained in:
commit
606e269e14
1 changed files with 2 additions and 2 deletions
|
@ -1228,7 +1228,7 @@ compat_fn! {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_env = "gnu")]
|
#[cfg(all(target_env = "gnu", feature = "backtrace"))]
|
||||||
mod gnu {
|
mod gnu {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
@ -1256,5 +1256,5 @@ mod gnu {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_env = "gnu")]
|
#[cfg(all(target_env = "gnu", feature = "backtrace"))]
|
||||||
pub use self::gnu::*;
|
pub use self::gnu::*;
|
||||||
|
|
Loading…
Reference in a new issue