From 7cc0c82b78e4d18c17771795c4e2c9202af13536 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sat, 2 May 2020 08:48:23 +0100 Subject: [PATCH] travis: Compile on macOS 10.13 with more up to date compiler --- .travis.yml | 2 +- .travis/macos/build.sh | 7 ++++++- .travis/macos/deps.sh | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93fda1dfaf..b0fbe3c5f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: - os: osx env: NAME="macos build" sudo: false - osx_image: xcode10.2 + osx_image: xcode10 install: "./.travis/macos/deps.sh" script: "./.travis/macos/build.sh" after_success: "./.travis/macos/upload.sh" diff --git a/.travis/macos/build.sh b/.travis/macos/build.sh index 0abd1a93a2..4c70cd3fa7 100755 --- a/.travis/macos/build.sh +++ b/.travis/macos/build.sh @@ -5,7 +5,12 @@ set -o pipefail export MACOSX_DEPLOYMENT_TARGET=10.14 export Qt5_DIR=$(brew --prefix)/opt/qt5 export UNICORNDIR=$(pwd)/externals/unicorn -export PATH="/usr/local/opt/ccache/libexec:$PATH" +export PATH="/usr/local/opt/ccache/libexec:/usr/local/opt/llvm/bin:$PATH" + +export CC="clang" +export CXX="clang++" +export LDFLAGS="-L/usr/local/opt/llvm/lib" +export CPPFLAGS="-I/usr/local/opt/llvm/include" # TODO: Build using ninja instead of make mkdir build && cd build diff --git a/.travis/macos/deps.sh b/.travis/macos/deps.sh index faeafa2165..71bfa399bb 100755 --- a/.travis/macos/deps.sh +++ b/.travis/macos/deps.sh @@ -1,6 +1,6 @@ #!/bin/sh -ex brew update -brew install p7zip qt5 sdl2 ccache +brew install p7zip qt5 sdl2 ccache llvm brew outdated cmake || brew upgrade cmake pip3 install macpack