From 55254968fc3bfc356107debae667a62ce008a1c2 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Wed, 8 May 2019 22:35:39 +0100
Subject: [PATCH] travis: Test on GCC 8

---
 .travis.yml                         | 15 ++++++++++++++-
 .travis/build-x86_64-linux/build.sh |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 995d9c12..fa223061 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ cache: ccache
 
 matrix:
   include:
-    - env: NAME="Linux Build"
+    - env: NAME="Linux Build" GCC_VERSION=7
       os: linux
       dist: trusty
       addons:
@@ -17,6 +17,19 @@ matrix:
             - ninja-build
       install: ./.travis/build-x86_64-linux/deps.sh
       script: ./.travis/build-x86_64-linux/build.sh
+    - env: NAME="Linux Build" GCC_VERSION=8
+      os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-8
+            - g++-8
+            - ninja-build
+      install: ./.travis/build-x86_64-linux/deps.sh
+      script: ./.travis/build-x86_64-linux/build.sh
     - env: NAME="Test - Fuzz against Unicorn"
       os: linux
       dist: trusty
diff --git a/.travis/build-x86_64-linux/build.sh b/.travis/build-x86_64-linux/build.sh
index e7c7c4e0..6813edbc 100755
--- a/.travis/build-x86_64-linux/build.sh
+++ b/.travis/build-x86_64-linux/build.sh
@@ -3,8 +3,8 @@
 set -e
 set -x
 
-export CC=gcc-7
-export CXX=g++-7
+export CC=gcc-${GCC_VERSION}
+export CXX=g++-${GCC_VERSION}
 export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
 
 mkdir build && cd build