about summary refs log tree commit diff
path: root/src/test/ui/range
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-11-10 01:16:02 +0000
committerbors <bors@rust-lang.org>2018-11-10 01:16:02 +0000
commit06118eac4c602a22d2004c98756a95f2c5ec95d5 (patch)
tree4039e739f4710fbe8a4aab96b21bfd1cc46a0daa /src/test/ui/range
parent36a50c29f6c5c386fba6ab685818755ac55152e5 (diff)
parent82574e9ec804b6efbf6dfcf523d32618528ee32b (diff)
downloadrust-06118eac4c602a22d2004c98756a95f2c5ec95d5.tar.gz
rust-06118eac4c602a22d2004c98756a95f2c5ec95d5.zip
Auto merge of #55626 - nikic:update-emscripten, r=alexcrichton
Update emscripten

This updates emscripten to 1.38.15, which is based on LLVM 6.0.1 and would allow us to drop code for handling LLVM 4.

The main issue I ran into is that exporting statics through `EXPORTED_FUNCTIONS` no longer works. As far as I understand exporting non-functions doesn't really make sense under emscripten anyway, so I've modified the symbol export code to not even try.

Closes #52323.
Diffstat (limited to 'src/test/ui/range')
-rw-r--r--src/test/ui/range/issue-54505-no-std.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/range/issue-54505-no-std.rs b/src/test/ui/range/issue-54505-no-std.rs
index 1915fd82899..22cf15fb2e4 100644
--- a/src/test/ui/range/issue-54505-no-std.rs
+++ b/src/test/ui/range/issue-54505-no-std.rs
@@ -11,7 +11,7 @@
 
 use core::ops::RangeBounds;
 
-#[cfg(not(target_arch = "wasm32"))]
+#[cfg(any(not(target_arch = "wasm32"), target_os = "emscripten"))]
 #[lang = "eh_personality"]
 extern fn eh_personality() {}