diff --git a/.github/workflows/ci-emscripten.yml b/.github/workflows/ci-emscripten.yml index 13cce318c7..30cd2e8449 100644 --- a/.github/workflows/ci-emscripten.yml +++ b/.github/workflows/ci-emscripten.yml @@ -23,6 +23,13 @@ jobs: run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} + - name: Update to modern GCC + run: | + apt-get update + apt-get install -y gcc-12 g++-12 + update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 + update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100 + - name: Setup cache uses: actions/cache@v4 with: diff --git a/os/emscripten/Dockerfile b/os/emscripten/Dockerfile index 543bf6b2de..57c332b1e3 100644 --- a/os/emscripten/Dockerfile +++ b/os/emscripten/Dockerfile @@ -1,3 +1,10 @@ FROM emscripten/emsdk:3.1.57 +RUN apt-get update \ + && apt-get install -y gcc-12 g++-12 \ + && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 \ + && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + COPY ports/liblzma.py /emsdk/upstream/emscripten/tools/ports/contrib/liblzma.py