Enable wasm32-unknown-unknown rust-lang/rust#45905

.circleci/config.yml

@@ -12,8 +12,13 @@ jobs:
       - run:
           name: Build and push Docker image
           command: |
-            docker build -t opengg/rust-wasm:latest .
+            DOCKER_TAG="${CIRCLE_BRANCH}"
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              DOCKER_TAG="latest"
+            fi
+            docker build -t opengg/rust-wasm:local .
             echo "$DOCKER_PASSWORD_BASE64"|base64 -d|docker login -u "$DOCKER_USER" --password-stdin
-            docker tag opengg/rust-wasm:latest "opengg/rust-wasm:1.0.$CIRCLE_BUILD_NUM"
-            docker push opengg/rust-wasm:latest
+            docker tag opengg/rust-wasm:local "opengg/rust-wasm:$DOCKER_TAG"
+            docker tag opengg/rust-wasm:local "opengg/rust-wasm:1.0.$CIRCLE_BUILD_NUM"
+            docker push "opengg/rust-wasm:$DOCKER_TAG"
             docker push "opengg/rust-wasm:1.0.$CIRCLE_BUILD_NUM"

Dockerfile

@@ -22,7 +22,7 @@ RUN cd / \
   && cd llvm \
   && mkdir working \
   && cd working \
-  && cmake -DCMAKE_INSTALL_PREFIX=/rust-wasm-bin/llvm -DCMAKE_BUILD_TYPE=Release -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly .. \
+  && cmake -DLLVM_DEFAULT_TARGET_TRIPLE=wasm32-unknown-unknown -DCMAKE_INSTALL_PREFIX=/rust-wasm-bin/llvm -DCMAKE_BUILD_TYPE=Release -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly .. \
   && make -j8 \
   && make install \
   # binaryen
@@ -35,7 +35,7 @@ RUN cd / \
   && make -j8 \
   && make install \
   # rustup
-  && curl https://sh.rustup.rs -sSf | sh -s -- -y \
+  && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly \
   # clean
   && apt-get purge -y --auto-remove git build-essential cmake curl g++ python \
   && apt-get autoclean -y \