mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: use GCC 12 for building tools for Emscripten

pull/13433/head
Rubidium 2025-02-01 15:36:03 +01:00 committed by rubidium42
parent ac6f3542a8
commit 3e747397f0
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/ci-emscripten.yml vendored
View File

@ -23,6 +23,13 @@ jobs:
run: | run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE} 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 - name: Setup cache
uses: actions/cache@v4 uses: actions/cache@v4
with: with:

7
os/emscripten/Dockerfile
View File

@ -1,3 +1,10 @@
FROM emscripten/emsdk:3.1.57 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 COPY ports/liblzma.py /emsdk/upstream/emscripten/tools/ports/contrib/liblzma.py