Skip to content

Commit 023240c

Browse files
committed
Switch to gcc-14 by default to fix some run-make tests
1 parent 5bd2c80 commit 023240c

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ jobs:
5252
# `llvm-14-tools` is needed to install the `FileCheck` binary which is used for asm tests.
5353
run: sudo apt-get install ninja-build ripgrep llvm-14-tools llvm libstdc++6
5454

55-
- run: g++ -v
56-
57-
- run: find / -name libstdc++.so | true
58-
5955
- name: Install rustfmt & clippy
6056
run: rustup component add rustfmt clippy
6157

@@ -67,6 +63,12 @@ jobs:
6763
sudo dpkg --force-overwrite -i ${{ matrix.libgccjit_version.gcc }}
6864
echo 'gcc-path = "/usr/lib/"' > config.toml
6965
66+
# Some run-make tests fail if we use our forked GCC because it doesn't
67+
# bundle libstdc++, so we switch to gcc-14 to have a GCC that has
68+
# libstdc++.
69+
- name: Set default GCC to gcc-14
70+
run: sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-14 30
71+
7072
- name: Set env
7173
run: |
7274
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV

.github/workflows/release.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ jobs:
4949
sudo dpkg --force-overwrite -i gcc-15.deb
5050
echo 'gcc-path = "/usr/lib/"' > config.toml
5151
52+
# Some run-make tests fail if we use our forked GCC because it doesn't
53+
# bundle libstdc++, so we switch to gcc-14 to have a GCC that has
54+
# libstdc++.
55+
- run: sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-14 30
56+
5257
- name: Set env
5358
run: |
5459
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV

0 commit comments

Comments
 (0)