summaryrefslogtreecommitdiff
path: root/Meta
diff options
context:
space:
mode:
authorLinus Groh <mail@linusgroh.de>2022-10-25 20:28:09 +0100
committerLinus Groh <mail@linusgroh.de>2022-10-25 23:15:51 +0100
commitbc2ebcadc0eb695605051c9d362c3f5dc184c63c (patch)
treed3579761351733ffb77a011687e262d245683ab1 /Meta
parent28bc3a76d916383c980b534c58b148c542ee4189 (diff)
downloadserenity-bc2ebcadc0eb695605051c9d362c3f5dc184c63c.zip
Everywhere: Require version >= 12 for GCC host compiler
So far we've gotten away with using GCC 11 for Lagom and to compile the toolchain, but via #15795 we discovered a compiler bug that has been fixed in the latest version but would error the build with CI's GCC 11. Time for an upgrade :^) We already use ubuntu-22.04 images in most places, so this is pretty straightforward. The only exception is Idan's self-hosted runner, which uses Ubuntu Focal. LibJS should build fine with GCC 11, still.
Diffstat (limited to 'Meta')
-rw-r--r--Meta/Azure/Lagom.yml4
-rw-r--r--Meta/Azure/Serenity.yml4
-rw-r--r--Meta/Azure/Setup.yml10
-rwxr-xr-xMeta/serenity.sh4
4 files changed, 11 insertions, 11 deletions
diff --git a/Meta/Azure/Lagom.yml b/Meta/Azure/Lagom.yml
index 253b146d4c..41c394fa1b 100644
--- a/Meta/Azure/Lagom.yml
+++ b/Meta/Azure/Lagom.yml
@@ -102,8 +102,8 @@ jobs:
-DWASM_SPEC_TEST_SKIP_FORMATTING=ON \
-DENABLE_UNDEFINED_SANITIZER=ON \
-DENABLE_ADDRESS_SANITIZER=ON \
- -DCMAKE_C_COMPILER=gcc-11 \
- -DCMAKE_CXX_COMPILER=g++-11
+ -DCMAKE_C_COMPILER=gcc-12 \
+ -DCMAKE_CXX_COMPILER=g++-12
displayName: 'Create Build Environment'
workingDirectory: $(Build.SourcesDirectory)/Meta/Lagom
env:
diff --git a/Meta/Azure/Serenity.yml b/Meta/Azure/Serenity.yml
index 65aa7d927b..0d75f001f0 100644
--- a/Meta/Azure/Serenity.yml
+++ b/Meta/Azure/Serenity.yml
@@ -50,8 +50,8 @@ jobs:
-DDUMP_REGIONS_ON_CRASH=ON \
-DENABLE_PCI_IDS_DOWNLOAD=OFF \
-DENABLE_USB_IDS_DOWNLOAD=OFF \
- -DCMAKE_C_COMPILER=gcc-11 \
- -DCMAKE_CXX_COMPILER=g++-11
+ -DCMAKE_C_COMPILER=gcc-12 \
+ -DCMAKE_CXX_COMPILER=g++-12
displayName: 'Create Build Environment'
workingDirectory: $(Build.SourcesDirectory)
env:
diff --git a/Meta/Azure/Setup.yml b/Meta/Azure/Setup.yml
index 53d12d4354..21aaf77d24 100644
--- a/Meta/Azure/Setup.yml
+++ b/Meta/Azure/Setup.yml
@@ -10,21 +10,21 @@ steps:
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main'
sudo apt-get update
- sudo apt-get install clang-format-14 ccache e2fsprogs gcc-11 g++-11 libstdc++-11-dev libmpfr-dev libmpc-dev ninja-build qemu-utils qemu-system-i386 unzip lld
+ sudo apt-get install clang-format-14 ccache e2fsprogs gcc-12 g++-12 libstdc++-12-dev libmpfr-dev libmpc-dev ninja-build qemu-utils qemu-system-i386 unzip lld
displayName: 'Install Dependencies'
- ${{ if eq(parameters.os, 'Linux') }}:
- script: |
- sudo apt-get purge -y clang-11 clang-12 gcc-10
+ sudo apt-get purge -y clang-12 gcc-10
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-13 main'
sudo apt-get update
- sudo apt-get install ccache gcc-11 g++-11 clang-13 libstdc++-11-dev ninja-build unzip
+ sudo apt-get install ccache gcc-12 g++-12 clang-13 libstdc++-12-dev ninja-build unzip
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-13 100
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 100
+ sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100
+ sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100
wget https://github.com/WebAssembly/wabt/releases/download/1.0.23/wabt-1.0.23-ubuntu.tar.gz
tar -xzf ./wabt-1.0.23-ubuntu.tar.gz
diff --git a/Meta/serenity.sh b/Meta/serenity.sh
index ed171e55b2..63ce4cbfcd 100755
--- a/Meta/serenity.sh
+++ b/Meta/serenity.sh
@@ -192,7 +192,7 @@ pick_host_compiler() {
return
fi
- find_newest_compiler egcc gcc gcc-11 gcc-12 /usr/local/bin/gcc-11 /opt/homebrew/bin/gcc-11
+ find_newest_compiler egcc gcc gcc-12 /usr/local/bin/gcc-12 /opt/homebrew/bin/gcc-12
if is_supported_compiler "$HOST_COMPILER"; then
export CC="${HOST_COMPILER}"
export CXX="${HOST_COMPILER/gcc/g++}"
@@ -206,7 +206,7 @@ pick_host_compiler() {
return
fi
- die "Please make sure that GCC version 11, Clang version 13, or higher is installed."
+ die "Please make sure that GCC version 12, Clang version 13, or higher is installed."
}
cmd_with_target() {