Merge #317

317: Try fully enabling `emscripten` targets again. r=reitermarkus a=reitermarkus Co-authored-by: Markus Reiter <me@reitermark.us>
cross-rs · Sep 9, 2019 · a43d540 · a43d540
2 parents 3a790d9 + 2518c2b
commit a43d540
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -60,8 +60,9 @@ strategy:
     x86_64-unknown-netbsd:           { TARGET: x86_64-unknown-netbsd,           CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24 }
     sparcv9-sun-solaris:             { TARGET: sparcv9-sun-solaris,             CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24 }
     x86_64-sun-solaris:              { TARGET: x86_64-sun-solaris,              CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24 }
-  # asmjs-unknown-emscripten:        { TARGET: asmjs-unknown-emscripten,        CPP: 1,           STD: 1,                   RUN: 1 }
-    wasm32-unknown-emscripten:       { TARGET: wasm32-unknown-emscripten,                         STD: 1 }
+    asmjs-unknown-emscripten:        { TARGET: asmjs-unknown-emscripten,        CPP: 1,           STD: 1,                   RUN: 1 }
+    # `cargo run` fails with an assertion error (https://github.com/rust-lang/cargo/issues/4689) on `wasm32-unknown-emscripten`.
+    wasm32-unknown-emscripten:       { TARGET: wasm32-unknown-emscripten,       CPP: 1,           STD: 1 }
     thumbv6m-none-eabi:              { TARGET: thumbv6m-none-eabi,                                STD: 1 }
     thumbv7em-none-eabi:             { TARGET: thumbv7em-none-eabi,                               STD: 1 }
     thumbv7em-none-eabihf:           { TARGET: thumbv7em-none-eabihf,                             STD: 1 }

diff --git a/...abled/Dockerfile.asmjs-unknown-emscripten → docker/Dockerfile.asmjs-unknown-emscripten b/...abled/Dockerfile.asmjs-unknown-emscripten → docker/Dockerfile.asmjs-unknown-emscripten