diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-08-08 23:11:50 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-08-08 23:16:05 +0200 |
| commit | 73ba85f3e889fc464ac73a9cda03a90aae547acd (patch) | |
| tree | 898bdcc88d31b8e5cf2b9a3fabaf602ec5d0540c | |
| parent | 21079ad690ec2003dbb4fcabbfda32705a90e320 (diff) | |
| download | servo-73ba85f3e889fc464ac73a9cda03a90aae547acd.tar.gz servo-73ba85f3e889fc464ac73a9cda03a90aae547acd.zip | |
Work around a rustc regression in macro name resolution
https://github.com/rust-lang/rust/issues/53205
| -rw-r--r-- | ports/servo/main.rs | 4 | ||||
| -rw-r--r-- | ports/servo/non_android_main.rs | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ports/servo/main.rs b/ports/servo/main.rs index 5d9174d9e73..c4cd657d138 100644 --- a/ports/servo/main.rs +++ b/ports/servo/main.rs @@ -17,6 +17,10 @@ #![cfg_attr(feature = "unstable", feature(core_intrinsics))] +// Have this here rather than in non_android_main.rs to work around +// https://github.com/rust-lang/rust/issues/53205 +#[cfg(not(target_os = "android"))] #[macro_use] extern crate log; + #[cfg(not(target_os = "android"))] include!("non_android_main.rs"); #[cfg(target_os = "android")] diff --git a/ports/servo/non_android_main.rs b/ports/servo/non_android_main.rs index 82d72557fa4..a8a9b05c298 100644 --- a/ports/servo/non_android_main.rs +++ b/ports/servo/non_android_main.rs @@ -9,7 +9,6 @@ extern crate gleam; extern crate glutin; #[macro_use] extern crate lazy_static; // The window backed by glutin -#[macro_use] extern crate log; #[cfg(any(target_os = "linux", target_os = "macos"))] extern crate osmesa_sys; extern crate servo; #[cfg(feature = "unstable")] |