diff options
| author | bors <bors@rust-lang.org> | 2017-10-04 00:57:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-10-04 00:57:30 +0000 |
| commit | 2db48d7fcbf0a2a1ceb4d8bbcbc74cd37349f629 (patch) | |
| tree | 1ba91df6321403d5752d953ff33716bc20f6a7a1 /src/libstd/sys/windows/mod.rs | |
| parent | bd90aa6daa5b73c2be85f604129ee40a6734cb6b (diff) | |
| parent | a5296a5fb2bf41ea4a13f8546a9fcc1182c5bfaf (diff) | |
| download | rust-2db48d7fcbf0a2a1ceb4d8bbcbc74cd37349f629.tar.gz rust-2db48d7fcbf0a2a1ceb4d8bbcbc74cd37349f629.zip | |
Auto merge of #44979 - hinaria:master, r=dtolnay
make `backtrace = false` compile for windows targets. when building for windows with `backtrace = false`, `libstd` fails to compile because some modules that use items from `sys_common::backtrace::*` are still included, even though those modules aren't used or referenced by anything. `sys_common::backtrace` doesn't exist when the backtrace feature is turned off. -- i've also added `#[cfg(feature = "backtrace")]` to various items that exist exclusively to support `mod backtrace` since the compilation would fail since they would be unused in a configuration with backtraces turned off.
Diffstat (limited to 'src/libstd/sys/windows/mod.rs')
| -rw-r--r-- | src/libstd/sys/windows/mod.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/sys/windows/mod.rs b/src/libstd/sys/windows/mod.rs index ee58efc5144..e7a9a121b25 100644 --- a/src/libstd/sys/windows/mod.rs +++ b/src/libstd/sys/windows/mod.rs @@ -20,9 +20,11 @@ use time::Duration; #[macro_use] pub mod compat; pub mod args; +#[cfg(feature = "backtrace")] pub mod backtrace; pub mod c; pub mod condvar; +#[cfg(feature = "backtrace")] pub mod dynamic_lib; pub mod env; pub mod ext; |