From 43277f8bdd66e8e6f7e9aac0e3034bbc05ce029b Mon Sep 17 00:00:00 2001 From: Charlie Gracie Date: Mon, 16 Oct 2017 18:34:37 -0400 Subject: [PATCH] Switch OS X to use Unix Makefiles Simplify the yml file and speed up the OS X builds slightly but not using the Ninja generator. Signed-off-by: Charlie Gracie --- .travis.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 573fa6a613f..7333292bd60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,13 +54,11 @@ matrix: exclude: - os: osx compiler: gcc - - os: osx - env: BUILD_WITH_CMAKE=yes CMAKE_GENERATOR="Unix Makefiles" - os: linux compiler: clang include: - # Auto tool builds - # 32 bit Linux x86 + ## Auto tool builds + # 32 bit Linux x86 - os: linux addons: apt: @@ -90,9 +88,9 @@ matrix: - llvm-3.4 env: RUN_LINT=yes RUN_BUILD=no SPEC=linux_x86-64 PLATFORM=amd64-linux64-gcc dist: precise - # CMake builds - # Ninja builds - # 64 bit Linux x86 + ## CMake builds + # Ninja builds + # 64 bit Linux x86 - os: linux addons: apt: @@ -105,9 +103,6 @@ matrix: - libelf-dev - ninja-build env: BUILD_WITH_CMAKE=yes CMAKE_GENERATOR=Ninja - # 64 bit OS X - - os: osx - env: BUILD_WITH_CMAKE=yes CMAKE_GENERATOR=Ninja before_script: - ulimit -c unlimited - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH=/usr/local/opt/ccache/libexec:$PATH ; fi