From 86d7785439e406d194ac8ed130c60e19008d1722 Mon Sep 17 00:00:00 2001
From: Lei Zhang <antiagainst@google.com>
Date: Thu, 12 Oct 2017 14:59:03 -0400
Subject: [PATCH] Travis CI: use make to build and stop require clang 3.6

---
 .travis.yml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 14d1a9c53..453d72a3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,13 +43,9 @@ branches:
 addons:
   apt:
     packages:
-      - clang-3.6
-      - ninja-build
       - lcov
 
 before_install:
-  # Install ninja on macOS.
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja; fi
   - if [[ "$BUILD_NDK" == "ON" ]]; then
       git clone --depth=1 https://github.com/urho3d/android-ndk.git $HOME/android-ndk;
       export ANDROID_NDK=$HOME/android-ndk;
@@ -62,10 +58,6 @@ install:
   - pip install --user cpp-coveralls
 
   - export PATH=$HOME/.local/bin:$PATH # Make sure we can find the above Python packages
-    # Make sure that clang-3.6 is selected.
-  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "clang" ]]; then
-      export CC=clang-3.6 CXX=clang++-3.6;
-    fi
 
 before_script:
   - git clone --depth=1 https://github.com/google/googletest          third_party/googletest
@@ -80,19 +72,17 @@ script:
             -DANDROID_NATIVE_API_LEVEL=android-9
             -DCMAKE_BUILD_TYPE=Release
             -DANDROID_ABI="armeabi-v7a with NEON"
-            -DSHADERC_SKIP_TESTS=ON
-            -GNinja ..;
+            -DSHADERC_SKIP_TESTS=ON ..;
     else
       cmake -DCMAKE_BUILD_TYPE=${SHADERC_BUILD_TYPE:-Debug}
-            -DENABLE_CODE_COVERAGE=${SHADERC_CODE_COVERAGE:-OFF}
-            -GNinja ..;
+            -DENABLE_CODE_COVERAGE=${SHADERC_CODE_COVERAGE:-OFF} ..;
     fi
-  - ninja
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       export NPROC=`nproc`;
     else
       export NPROC=`sysctl -n hw.ncpu`;
     fi
+  - make -j${NPROC}
   - if [[ "$BUILD_NDK" != "ON" ]]; then ctest -j${NPROC} --output-on-failure; fi
 
 after_success: