Skip to content

Commit

Permalink
Travis clang fix on OSX
Browse files Browse the repository at this point in the history
  • Loading branch information
grovesNL authored and kvark committed Oct 17, 2017
1 parent 3d4e40c commit 7132b64
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 9 deletions.
24 changes: 16 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,25 @@ cache:
directories:
- $HOME/deps

rust:
- stable
- nightly
os:
- linux
- osx
matrix:
include:
- os: linux
rust: stable
- os: linux
rust: nightly
- os: osx
rust: stable
osx_image: xcode9
compiler: clang
- os: osx
rust: nightly
osx_image: xcode9
compiler: clang

branches:
except:
- staging.tmp


notifications:
webhooks:
urls:
Expand All @@ -33,7 +41,7 @@ before_install:
# (assuming it will have libsdl2-dev and Rust by then)
# see https://docs.travis-ci.com/user/trusty-ci-environment/
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start && make travis-sdl2; fi
- if [[ $TRAVIS_OS_NAME == osx ]]; then brew update && brew install sdl2 && brew upgrade cmake; fi
- if [[ $TRAVIS_OS_NAME == osx ]]; then brew update && brew install sdl2 && brew upgrade cmake && export CXX=clang++ && export CC=clang && export MACOSX_DEPLOYMENT_TARGET=10.7; fi

addons:
apt:
Expand Down
2 changes: 1 addition & 1 deletion src/backend/metal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ cocoa = "0.9"
core-foundation = "0.3"
core-graphics = "0.9"
io-surface = "0.7"
spirv_cross = "0.3"
spirv_cross = { git = "https://github.com/grovesNL/spirv_cross.git", branch = "build-set-stdlib" }

0 comments on commit 7132b64

Please sign in to comment.