From ba9534da0a5f8073ee915b1a53a1d7e281830976 Mon Sep 17 00:00:00 2001
From: Matthias Volk <matthias.volk@cs.rwth-aachen.de>
Date: Mon, 2 Oct 2017 14:36:34 +0200
Subject: [PATCH] apple-clang was not recognized in travis

---
 .travis.yml               | 48 +++++++++++++++++++--------------------
 travis/build-helper.sh    |  5 ----
 travis/generate_travis.py |  2 +-
 travis/install_osx.sh     |  3 +--
 4 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 697118347..ee40491cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,8 +42,8 @@ jobs:
     # osx
     - stage: Build (1st run)
       os: osx
-      compiler: apple-clang
-      env: CONFIG=DefaultDebug COMPILER=apple-clang STL=libc++
+      compiler: clang
+      env: CONFIG=DefaultDebug COMPILER=clang STL=libc++
       install:
         - rm -rf build
         - travis/install_osx.sh
@@ -53,8 +53,8 @@ jobs:
         - find build -iname '*err*.log' -type f -print -exec cat {} \;
     - stage: Build (1st run)
       os: osx
-      compiler: apple-clang
-      env: CONFIG=DefaultRelease COMPILER=apple-clang STL=libc++
+      compiler: clang
+      env: CONFIG=DefaultRelease COMPILER=clang STL=libc++
       install:
         - rm -rf build
         - travis/install_osx.sh
@@ -97,8 +97,8 @@ jobs:
     # osx
     - stage: Build (2nd run)
       os: osx
-      compiler: apple-clang
-      env: CONFIG=DefaultDebug COMPILER=apple-clang STL=libc++
+      compiler: clang
+      env: CONFIG=DefaultDebug COMPILER=clang STL=libc++
       install:
         - travis/install_osx.sh
       script:
@@ -107,8 +107,8 @@ jobs:
         - find build -iname '*err*.log' -type f -print -exec cat {} \;
     - stage: Build (2nd run)
       os: osx
-      compiler: apple-clang
-      env: CONFIG=DefaultRelease COMPILER=apple-clang STL=libc++
+      compiler: clang
+      env: CONFIG=DefaultRelease COMPILER=clang STL=libc++
       install:
         - travis/install_osx.sh
       script:
@@ -148,8 +148,8 @@ jobs:
     # osx
     - stage: Build (3rd run)
       os: osx
-      compiler: apple-clang
-      env: CONFIG=DefaultDebug COMPILER=apple-clang STL=libc++
+      compiler: clang
+      env: CONFIG=DefaultDebug COMPILER=clang STL=libc++
       install:
         - travis/install_osx.sh
       script:
@@ -158,8 +158,8 @@ jobs:
         - find build -iname '*err*.log' -type f -print -exec cat {} \;
     - stage: Build (3rd run)
       os: osx
-      compiler: apple-clang
-      env: CONFIG=DefaultRelease COMPILER=apple-clang STL=libc++
+      compiler: clang
+      env: CONFIG=DefaultRelease COMPILER=clang STL=libc++
       install:
         - travis/install_osx.sh
       script:
@@ -199,8 +199,8 @@ jobs:
     # osx
     - stage: Build (4th run)
       os: osx
-      compiler: apple-clang
-      env: CONFIG=DefaultDebug COMPILER=apple-clang STL=libc++
+      compiler: clang
+      env: CONFIG=DefaultDebug COMPILER=clang STL=libc++
       install:
         - travis/install_osx.sh
       script:
@@ -209,8 +209,8 @@ jobs:
         - find build -iname '*err*.log' -type f -print -exec cat {} \;
     - stage: Build (4th run)
       os: osx
-      compiler: apple-clang
-      env: CONFIG=DefaultRelease COMPILER=apple-clang STL=libc++
+      compiler: clang
+      env: CONFIG=DefaultRelease COMPILER=clang STL=libc++
       install:
         - travis/install_osx.sh
       script:
@@ -250,8 +250,8 @@ jobs:
     # osx
     - stage: Build (5th run)
       os: osx
-      compiler: apple-clang
-      env: CONFIG=DefaultDebug COMPILER=apple-clang STL=libc++
+      compiler: clang
+      env: CONFIG=DefaultDebug COMPILER=clang STL=libc++
       install:
         - travis/install_osx.sh
       script:
@@ -260,8 +260,8 @@ jobs:
         - find build -iname '*err*.log' -type f -print -exec cat {} \;
     - stage: Build (5th run)
       os: osx
-      compiler: apple-clang
-      env: CONFIG=DefaultRelease COMPILER=apple-clang STL=libc++
+      compiler: clang
+      env: CONFIG=DefaultRelease COMPILER=clang STL=libc++
       install:
         - travis/install_osx.sh
       script:
@@ -301,8 +301,8 @@ jobs:
     # osx
     - stage: Test all
       os: osx
-      compiler: apple-clang
-      env: CONFIG=DefaultDebug COMPILER=apple-clang STL=libc++
+      compiler: clang
+      env: CONFIG=DefaultDebug COMPILER=clang STL=libc++
       install:
         - travis/install_osx.sh
       script:
@@ -311,8 +311,8 @@ jobs:
         - find build -iname '*err*.log' -type f -print -exec cat {} \;
     - stage: Test all
       os: osx
-      compiler: apple-clang
-      env: CONFIG=DefaultRelease COMPILER=apple-clang STL=libc++
+      compiler: clang
+      env: CONFIG=DefaultRelease COMPILER=clang STL=libc++
       install:
         - travis/install_osx.sh
       script:
diff --git a/travis/build-helper.sh b/travis/build-helper.sh
index 5e1b589e3..7d722dc99 100755
--- a/travis/build-helper.sh
+++ b/travis/build-helper.sh
@@ -95,11 +95,6 @@ clang)
     export CXX=clang++
     ;;
 
-apple-clang)
-    export CC=clang
-    export CXX=clang++
-    ;;
-
 *)
     echo "Unrecognized value of COMPILER: $COMPILER"
     exit 1
diff --git a/travis/generate_travis.py b/travis/generate_travis.py
index 9fe6f82d0..13d91e691 100644
--- a/travis/generate_travis.py
+++ b/travis/generate_travis.py
@@ -9,7 +9,7 @@ configs_linux = [
 # Configurations for Mac
 configs_mac = [
     # OS, compiler
-    ("osx", "apple-clang", ""),
+    ("osx", "clang", ""),
 ]
 
 # Build types
diff --git a/travis/install_osx.sh b/travis/install_osx.sh
index e7fea4dec..e308372de 100755
--- a/travis/install_osx.sh
+++ b/travis/install_osx.sh
@@ -45,9 +45,8 @@ install_brew_package cmake
 case "${COMPILER}" in
 gcc)         install_brew_package gcc ;;
 gcc-6)       install_brew_package gcc@6 ;;
-clang)       install_brew_package llvm   --with-clang --with-libcxx;;
+clang)       ;;
 clang-4)     install_brew_package llvm@4 --with-clang --with-libcxx;;
-apple-clang) ;;
 *) echo "Compiler not supported: ${COMPILER}. See travis/install_osx.sh"; exit 1 ;;
 esac
 travis_fold end brew_install_util