Skip to content

Commit 2191212

Browse files
linusgawesomekling
authored andcommitted
Travis: Update host GCC to version 10
This allows us to use the latest C++20 features in programs which we compile and run as part of Lagom.
1 parent 88307fc commit 2191212

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@ notifications:
2424
before_install:
2525
- sudo apt-get update -qq
2626
# These packages are already part of the Travis image:
27-
#- sudo apt-get install -y g++-9 libstdc++-9-dev cmake shellcheck
27+
#- sudo apt-get install -y cmake shellcheck
28+
# Remove GCC 9 (installed by default) and replace it with GCC 10:
29+
- sudo apt-get purge -y g++-9 libstdc++-9-dev
2830
# These aren't:
29-
- sudo apt-get install -y libmpfr-dev libmpc-dev libgmp-dev clang-format-10
31+
- sudo apt-get install -y g++-10 libstdc++-10-dev libmpfr-dev libmpc-dev libgmp-dev clang-format-10
32+
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 --slave /usr/bin/g++ g++ /usr/bin/g++-10
3033
# If we ever do any qemu-emulation on Travis, we should re-enable this:
3134
#- e2fsprogs qemu-system-i386 qemu-utils
3235
- g++ --version

Meta/Lagom/ReadMe.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ If you want to bring the comfortable Serenity classes with you to another system
88

99
*Lagom* is a Swedish word that means "just the right amount." ([Wikipedia](https://en.wikipedia.org/wiki/Lagom))
1010

11+
## Prerequisites
12+
13+
You'll need a compiler as capable as the one used for the toolchain - which might differ from the compiler you used *to compile* the toolchain. Check `GCC_VERSION` in [`BuildIt.sh`](../../Toolchain/BuildIt.sh).
14+
1115
## Fuzzing
1216

1317
Lagom can be used to fuzz parts of SerenityOS's code base. This requires buildling with `clang`, so it's convenient to use a different build directory for that. Run CMake like this:

0 commit comments

Comments
 (0)