diff --git a/.changes/1609.json b/.changes/1609.json new file mode 100644 index 000000000..75149f05b --- /dev/null +++ b/.changes/1609.json @@ -0,0 +1,5 @@ +{ + "description": "remove `asmjs-unknown-emscripten` target.", + "type": "removed", + "breaking": true +} diff --git a/README.md b/README.md index 5a089bd01..7672fddcb 100644 --- a/README.md +++ b/README.md @@ -261,7 +261,6 @@ terminate. | `x86_64-unknown-linux-gnu:centos` [5] | 2.17 | 4.8.5 | ✓ | 4.2.1 | ✓ | | `x86_64-unknown-linux-musl` | 1.2.3 | 9.2.0 | ✓ | N/A | ✓ | | `x86_64-unknown-netbsd` [3] | 9.2.0 | 9.4.0 | ✓ | N/A | | - [1] libc = bionic; Only works with native tests, that is, tests that do not depends on the Android Runtime. For i686 some tests may fails with the diff --git a/docker/Dockerfile.asmjs-unknown-emscripten b/docker/Dockerfile.asmjs-unknown-emscripten deleted file mode 100644 index 2b0a725d5..000000000 --- a/docker/Dockerfile.asmjs-unknown-emscripten +++ /dev/null @@ -1,23 +0,0 @@ -FROM emscripten/emsdk:3.1.14 -WORKDIR / -ENV DEBIAN_FRONTEND=noninteractive - -COPY common.sh lib.sh / -RUN /common.sh - -COPY cmake.sh / -RUN /cmake.sh - -COPY xargo.sh / -RUN /xargo.sh - -RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ - libxml2 \ - python - -ENV CROSS_TOOLCHAIN_PREFIX=em -ENV CROSS_SYSROOT=/emsdk/upstream/emscripten/cache/sysroot -ENV CROSS_TARGET_RUNNER="node" -ENV CARGO_TARGET_ASMJS_UNKNOWN_EMSCRIPTEN_RUNNER="$CROSS_TARGET_RUNNER" \ - BINDGEN_EXTRA_CLANG_ARGS_asmjs_unknown_emscripten="--sysroot=$CROSS_SYSROOT" \ - CMAKE_TOOLCHAIN_FILE_asmjs_unknown_emscripten=/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake diff --git a/docker/emscripten.sh b/docker/emscripten.sh deleted file mode 100755 index 28f2d7877..000000000 --- a/docker/emscripten.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -set -x -set -euo pipefail - -# shellcheck disable=SC1091 -. lib.sh - -main() { - install_packages ca-certificates \ - curl \ - git \ - libxml2 \ - python - - cd / - git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable - cd /emsdk-portable - - ./emsdk install 1.38.46-upstream - ./emsdk activate 1.38.46-upstream - - # Compile and cache libc - echo 'int main() {}' > a.c - emcc a.c - emcc -s BINARYEN=1 a.c - echo -e '#include \n void hello(){ std::cout << std::endl; }' > a.cpp - emcc a.cpp - emcc -s BINARYEN=1 a.cpp - rm -f a.* - - # Make emsdk usable by any user - chmod a+rwX -R "${EMSDK}" - - purge_packages - - rm "${0}" -} - -main "${@}" diff --git a/src/lib.rs b/src/lib.rs index c3d2ba78e..fa7945bfb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -152,7 +152,6 @@ impl TargetTriple { "x86_64-linux-android" => None, "x86_64-pc-windows-gnu" => None, "i686-pc-windows-gnu" => None, - "asmjs-unknown-emscripten" => None, "wasm32-unknown-emscripten" => None, "x86_64-unknown-dragonfly" => Some("dragonflybsd-amd64"), "i686-unknown-freebsd" => Some("freebsd-i386"), diff --git a/targets.toml b/targets.toml index 759e6867a..50758b724 100644 --- a/targets.toml +++ b/targets.toml @@ -402,15 +402,6 @@ cpp = true std = true run = true -[[target]] -# Disabled for now, see https://github.com/rust-lang/rust/issues/98216 & https://github.com/cross-rs/cross/issues/634 -disabled = true -target = "asmjs-unknown-emscripten" -os = "ubuntu-latest" -cpp = true -std = true -run = true - [[target]] target = "wasm32-unknown-emscripten" os = "ubuntu-latest"