Skip to content

Commit

Permalink
Install the Emscripten toolchain via emsdk (instead of a separate Doc…
Browse files Browse the repository at this point in the history
…ker image)

Allows more architecture flexibility (the emsdk installer supports arm64,
but the images published do not, see emscripten-core/emsdk#1206) and
makes it much easier to update to newer versions.

As part of this we use the most recent version of Emscripten that has
arm64 support (3.1.33), jumping from 2.0.34.

Updates #178
  • Loading branch information
mihaip committed Apr 23, 2023
1 parent 92de364 commit dc40501
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
19 changes: 16 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
FROM ghcr.io/mihaip/emscripten-devcontainer:2.0.34
RUN apt update && apt install -y autoconf libsdl1.2-dev wget lzip
FROM ubuntu:22.04

RUN apt update && apt install -y \
python3 cmake git build-essential \
autoconf libsdl1.2-dev wget lzip

# Emscripten still does not release arm64 versions of their Docker images
# (https://github.com/emscripten-core/emsdk/issues/1206) so we need to install
# the SDK manually.
RUN git clone https://github.com/emscripten-core/emsdk.git \
&& cd emsdk \
&& ./emsdk install 3.1.33 \
&& ./emsdk activate 3.1.33 \
&& echo "source $(pwd)/emsdk_env.sh" >> $HOME/.bashrc

COPY macemu/BasiliskII/src/Unix/_em_build_mpfr.sh /tmp/_em_build_mpfr.sh
RUN /tmp/_em_build_mpfr.sh
RUN /tmp/_em_build_mpfr.sh

0 comments on commit dc40501

Please sign in to comment.