travis: Compile on macOS 10.13 with more up to date compiler

This commit is contained in:
MerryMage
2020-05-02 08:48:23 +01:00
committed by FearlessTobi
parent 9943a478fe
commit 7cc0c82b78
3 changed files with 8 additions and 3 deletions

View File

@@ -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"

View File

@@ -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

View File

@@ -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