From 73befdfa721cc17f0a7852c386b4887b30499679 Mon Sep 17 00:00:00 2001
From: Marcel Kost <mkost1@gmx.de>
Date: Wed, 25 Apr 2018 10:44:59 -0400
Subject: [PATCH] Fix travis build to actually use gcc5

---
 .travis.yml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 66693cf293e..a0c4ce671f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,17 +29,19 @@ matrix:
           env:
               # NAME has no actual use, just to make the travis jobs overview more clear
               - NAME="gcc5 Debug/Tests/AddressSanitizer/Coveralls"
-              - CXX=g++-5
-              - CC=gcc-5
-              - PELOTON_BUILD_TYPE=Debug
-              - COVERALLS=On
+          # set env variables manually
+          before_install:
+              - export CXX=g++-5
+              - export CC=gcc-5
+              - export PELOTON_BUILD_TYPE=Debug
+              - export COVERALLS=On
           # override script value to run also tests and benchmarks
           script:
               # create build directory
               - mkdir build
               - cd build
               # run cmake. NOTE: the PATH is made explicit to avoid automatic selection of the preinstalled llvm version in the Travis trusty image
-              - PATH=/usr/lib/llvm-3.7/bin:/usr/bin:$PATH cmake -DCOVERALLS=$COVERALLS -DCMAKE_PREFIX_PATH=`llvm-config-3.7 --prefix` -DCMAKE_BUILD_TYPE=$PELOTON_BUILD_TYPE -DUSE_SANITIZER=Address ..
+              - PATH=/usr/lib/llvm-3.7/bin:/usr/bin:$PATH CXX=g++-5 cmake -DCOVERALLS=$COVERALLS -DCMAKE_PREFIX_PATH=`llvm-config-3.7 --prefix` -DCMAKE_BUILD_TYPE=$PELOTON_BUILD_TYPE -DUSE_SANITIZER=Address ..
               # build
               - make -j4
               # run tests
@@ -72,17 +74,19 @@ matrix:
           env:
               # NAME has no actual use, just to make the travis jobs overview more clear
               - NAME="gcc5 Release/Tests/AddressSanitizer"
-              - CXX=g++-5
-              - CC=gcc-5
-              - PELOTON_BUILD_TYPE=Release
-              - COVERALLS=Off
+          # set env variables manually
+          before_install:
+              - export CXX=g++-5
+              - export CC=gcc-5
+              - export PELOTON_BUILD_TYPE=Release
+              - export COVERALLS=Off
           # override script value to run also tests and benchmarks
           script:
               # create build directory
               - mkdir build
               - cd build
               # run cmake. NOTE: the PATH is made explicit to avoid automatic selection of the preinstalled llvm version in the Travis trusty image
-              - PATH=/usr/lib/llvm-3.7/bin:/usr/bin:$PATH cmake -DCOVERALLS=$COVERALLS -DCMAKE_PREFIX_PATH=`llvm-config-3.7 --prefix` -DCMAKE_BUILD_TYPE=$PELOTON_BUILD_TYPE -DUSE_SANITIZER=Address ..
+              - PATH=/usr/lib/llvm-3.7/bin:/usr/bin:$PATH CXX=g++-5 cmake -DCOVERALLS=$COVERALLS -DCMAKE_PREFIX_PATH=`llvm-config-3.7 --prefix` -DCMAKE_BUILD_TYPE=$PELOTON_BUILD_TYPE -DUSE_SANITIZER=Address ..
               # build
               - make -j4
               # run tests