Simplify travis build script.

7403a237 · Stefan Behnel · 46132491 · 7403a237
Commit 7403a237 authored 6 years ago by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 9 deletions

.travis.yml .travis.yml +5 -9

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -112,16 +112,12 @@ branches:
 before_install:
  - |
    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60
+      sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-8
      sudo update-alternatives --set gcc /usr/bin/gcc-8
-      export CC=gcc-8
+      sudo update-alternatives --set g++ /usr/bin/g++-8
-      if [ "$BACKEND" = cpp ]; then
+      export  CC=gcc-8  CXX=g++-8
-        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 60
+      $CC --version
-        sudo update-alternatives --set g++ /usr/bin/g++-8
+      $CXX --version
-        export CXX=g++-8
-      fi
-      if [ -n "$CC" ]; then $CC --version; else gcc --version; fi
-      if [ -n "$CXX" ]; then $CXX --version; else g++ --version; fi
    fi
  - |