about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-05-08 18:48:31 +0200
committerGitHub <noreply@github.com>2020-05-08 18:48:31 +0200
commitb750ee496426d626a17e22f07c7c260b4e31a4c5 (patch)
tree384d462f5219dd3693a24015e7e6604ccbcf0d2f
parent0c8ef4772a18b913965382613ca1e99b98f37e08 (diff)
parent732eaf81b7e95dc724b3d71ed2f87bd7b91e052b (diff)
downloadrust-b750ee496426d626a17e22f07c7c260b4e31a4c5.tar.gz
rust-b750ee496426d626a17e22f07c7c260b4e31a4c5.zip
Rollup merge of #72003 - ctaggart:wasm, r=jonas-schievink
allow wasm target for rustc-ap-rustc_span

This fixes #71998 by applying the work-a-round. The root cause is probably #56935, as @petrochenkov pointed out.

I reproduced the bug by:
```
cd ~/.cargo/registry/src/github.com-1ecc6299db9ec823/rustc-ap-rustc_span-657.0.0/
cargo build --target wasm32-unknown-unknown
```

Adding this line fixes it.
-rw-r--r--src/librustc_span/lib.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/librustc_span/lib.rs b/src/librustc_span/lib.rs
index 060ad604369..dd7ba5cb6fc 100644
--- a/src/librustc_span/lib.rs
+++ b/src/librustc_span/lib.rs
@@ -14,6 +14,10 @@
 #![feature(optin_builtin_traits)]
 #![feature(specialization)]
 
+// FIXME(#56935): Work around ICEs during cross-compilation.
+#[allow(unused)]
+extern crate rustc_macros;
+
 use rustc_data_structures::AtomicRef;
 use rustc_macros::HashStable_Generic;
 use rustc_serialize::{Decodable, Decoder, Encodable, Encoder};