mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 22:07:36 +00:00
Meta+CI+Documentation: Bump host gcc requirement up to gcc 11
Bump macOS CI version to macOS 11 while we're here.
This commit is contained in:
parent
d70aba6a11
commit
c62c10caf0
13 changed files with 51 additions and 45 deletions
|
@ -10,18 +10,18 @@ Make sure you have all the dependencies installed:
|
|||
sudo apt install build-essential cmake curl libmpfr-dev libmpc-dev libgmp-dev e2fsprogs ninja-build qemu-system-gui qemu-system-x86 qemu-utils ccache rsync unzip texinfo
|
||||
```
|
||||
|
||||
#### GCC 10
|
||||
#### GCC 11
|
||||
|
||||
On Ubuntu gcc-10 is available in the repositories of 20.04 (Focal) and later - add the `ubuntu-toolchain-r/test` PPA if you're running an older version:
|
||||
On Ubuntu gcc-11 is available in the repositories of 21.04 (Hirsuite) and later - add the `ubuntu-toolchain-r/test` PPA if you're running an older version:
|
||||
|
||||
```console
|
||||
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
|
||||
```
|
||||
|
||||
Now on Ubuntu or Debian you can install gcc-10 with apt like this:
|
||||
Now on Ubuntu or Debian you can install gcc-11 with apt like this:
|
||||
|
||||
```console
|
||||
sudo apt install gcc-10 g++-10
|
||||
sudo apt install gcc-11 g++-11
|
||||
```
|
||||
|
||||
#### QEMU 5 or later
|
||||
|
|
|
@ -36,7 +36,7 @@ with import <nixpkgs> {};
|
|||
stdenv.mkDerivation {
|
||||
name = "cpp-env";
|
||||
nativeBuildInputs = [
|
||||
gcc10
|
||||
gcc11
|
||||
curl
|
||||
cmake
|
||||
mpfr
|
||||
|
|
|
@ -19,12 +19,13 @@ These instructions assume the OS installed is Ubuntu 20.04 (Focal), so they migh
|
|||
### Install base dependencies
|
||||
```shell
|
||||
add-apt-repository ppa:canonical-server/server-backports
|
||||
add-apt-repository ppa:ubuntu-toolchain-r/test
|
||||
apt update
|
||||
apt install git build-essential make cmake clang-format-11 gcc-10 g++-10 libstdc++-10-dev libgmp-dev ccache libmpfr-dev libmpc-dev ninja-build e2fsprogs qemu-utils qemu-system-i386 wabt
|
||||
apt install git build-essential make cmake clang-format-11 gcc-11 g++-11 libstdc++-11-dev libgmp-dev ccache libmpfr-dev libmpc-dev ninja-build e2fsprogs qemu-utils qemu-system-i386 wabt
|
||||
```
|
||||
### Force usage of GCC 10
|
||||
### Force usage of GCC 11
|
||||
```shell
|
||||
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
|
||||
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11
|
||||
```
|
||||
### Create a new user account named 'runner'
|
||||
```shell
|
||||
|
|
|
@ -16,7 +16,7 @@ install it. You can also build it using the `Toolchain/BuildQemu.sh` script.
|
|||
|
||||
### GCC is missing or is outdated
|
||||
|
||||
Ensure your gcc version is >= 10 with `gcc --version`. Otherwise, install it. If your gcc binary is not
|
||||
Ensure your gcc version is >= 11 with `gcc --version`. Otherwise, install it. If your gcc binary is not
|
||||
called `gcc` you have to specify the names of your C and C++ compiler when you run cmake, e.g.
|
||||
`cmake ../.. -GNinja -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11`.
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue