We will no longer build wasm32, so drop the docker config. Streamline the dockerfile to hardcode TARGET_CPU as wasm64.
Signed-off-by: Richard Henderson <[email protected]> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/dockerfiles/emsdk-wasm-cross.docker | 15 ++++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 6bdd482b80..b376c837dc 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -90,5 +90,4 @@ wasm64-emsdk-cross-container: extends: .container_job_template variables: NAME: emsdk-wasm64-cross - BUILD_ARGS: --build-arg TARGET_CPU=wasm64 DOCKERFILE: emsdk-wasm-cross diff --git a/tests/docker/dockerfiles/emsdk-wasm-cross.docker b/tests/docker/dockerfiles/emsdk-wasm-cross.docker index ecd5a02903..8a924816f9 100644 --- a/tests/docker/dockerfiles/emsdk-wasm-cross.docker +++ b/tests/docker/dockerfiles/emsdk-wasm-cross.docker @@ -7,7 +7,6 @@ ARG GLIB_VERSION=${GLIB_MINOR_VERSION}.0 ARG PIXMAN_VERSION=0.44.2 ARG FFI_VERSION=v3.5.2 ARG MESON_VERSION=1.5.0 -ARG TARGET_CPU=wasm32 FROM docker.io/emscripten/emsdk:$EMSDK_VERSION_QEMU AS build-base-common ARG MESON_VERSION @@ -31,21 +30,16 @@ RUN mkdir /build WORKDIR /build RUN mkdir -p $TARGET -FROM build-base-common AS build-base-wasm32 - -FROM build-base-common AS build-base-wasm64 +FROM build-base-common AS build-base ENV CFLAGS="$CFLAGS -sMEMORY64=1" ENV CXXFLAGS="$CXXFLAGS -sMEMORY64=1" ENV LDFLAGS="$LDFLAGS -sMEMORY64=1" - -FROM build-base-${TARGET_CPU} AS build-base -ARG TARGET_CPU RUN <<EOF cat <<EOT > /cross.meson [host_machine] system = 'emscripten' -cpu_family = '${TARGET_CPU}' -cpu = '${TARGET_CPU}' +cpu_family = 'wasm64' +cpu = 'wasm64' endian = 'little' [binaries] @@ -67,14 +61,13 @@ RUN emconfigure ./configure --prefix=$TARGET --static RUN emmake make install -j$(nproc) FROM build-base AS libffi-dev -ARG TARGET_CPU ARG FFI_VERSION RUN mkdir -p /libffi RUN git clone https://github.com/libffi/libffi /libffi WORKDIR /libffi RUN git checkout $FFI_VERSION RUN autoreconf -fiv -RUN emconfigure ./configure --host=${TARGET_CPU}-unknown-linux \ +RUN emconfigure ./configure --host=wasm64-unknown-linux \ --prefix=$TARGET --enable-static \ --disable-shared --disable-dependency-tracking \ --disable-builddir --disable-multi-os-directory \ -- 2.43.0
