diff options
| author | Thomas Lively <tlively@google.com> | 2017-06-20 13:37:58 -0700 |
|---|---|---|
| committer | Thomas Lively <tlively@google.com> | 2017-06-22 18:34:56 -0700 |
| commit | 447297ce597d2762db40afaa2349fc927c90f897 (patch) | |
| tree | c78f7493384a6805b973a49d5b6a685d969072b0 /src/ci/docker | |
| parent | bd62230fbdcaf6508dec02a59818f732bd4c1759 (diff) | |
| download | rust-447297ce597d2762db40afaa2349fc927c90f897.tar.gz rust-447297ce597d2762db40afaa2349fc927c90f897.zip | |
Make wasm32 buildbot test LLVM backend
This adds the experimental targets option to configure so it can be used by the builders and changes the wasm32 Dockerfile accordingly. Instead of using LLVM from the emsdk, the builder's emscripten tools now uses the Rust in-tree LLVM, since this is the one built with wasm support.
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/disabled/wasm32/Dockerfile | 6 | ||||
| -rw-r--r-- | src/ci/docker/scripts/emscripten.sh | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ci/docker/disabled/wasm32/Dockerfile b/src/ci/docker/disabled/wasm32/Dockerfile index daf398ac096..f3dd48ae411 100644 --- a/src/ci/docker/disabled/wasm32/Dockerfile +++ b/src/ci/docker/disabled/wasm32/Dockerfile @@ -20,7 +20,7 @@ RUN sh /scripts/dumb-init.sh # emscripten COPY scripts/emscripten.sh /scripts/ RUN bash /scripts/emscripten.sh -COPY wasm32/node.sh /usr/local/bin/node +COPY disabled/wasm32/node.sh /usr/local/bin/node # env ENV PATH=$PATH:/emsdk-portable @@ -30,9 +30,9 @@ ENV EMSCRIPTEN=/emsdk-portable/emscripten/1.37.13/ ENV BINARYEN_ROOT=/emsdk-portable/clang/e1.37.13_64bit/binaryen/ ENV EM_CONFIG=/emsdk-portable/.emscripten -ENV TARGETS=wasm32-unknown-emscripten +ENV TARGETS=wasm32-unknown-emscripten,wasm32-experimental-emscripten -ENV RUST_CONFIGURE_ARGS --target=$TARGETS +ENV RUST_CONFIGURE_ARGS --target=$TARGETS --experimental-targets=WebAssembly ENV SCRIPT python2.7 ../x.py test --target $TARGETS diff --git a/src/ci/docker/scripts/emscripten.sh b/src/ci/docker/scripts/emscripten.sh index 8aa5a98d7fc..516ef0ae0d2 100644 --- a/src/ci/docker/scripts/emscripten.sh +++ b/src/ci/docker/scripts/emscripten.sh @@ -40,9 +40,12 @@ hide_output ./emsdk install sdk-1.37.13-64bit source ./emsdk_env.sh echo "main(){}" > a.c HOME=/emsdk-portable/ emcc a.c -HOME=/emsdk-portable/ emcc -s BINARYEN=1 a.c +HOME=/emsdk-portable/ emcc -s WASM=1 a.c rm -f a.* +# Make emscripten use Rust's LLVM +echo "LLVM_ROOT='/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/bin'" >> /root/.emscripten + # Make emsdk usable by any user cp /root/.emscripten /emsdk-portable chmod a+rxw -R /emsdk-portable |