diff options
| author | Serge Bazanski <sergiusz@q3k.org> | 2018-12-05 17:22:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-05 17:22:14 +0100 |
| commit | 615b30bd29b13011f3faaeb660e9738262b37f3a (patch) | |
| tree | 2d7d25d428d0cf6eb4aa2f93000334d60038af8d | |
| parent | c800e3bb163550f83ac677676a89f701f5f36052 (diff) | |
| parent | 323480d66b541c3296f869f75bb33ed2ceeb8753 (diff) | |
| download | yosys-615b30bd29b13011f3faaeb660e9738262b37f3a.tar.gz yosys-615b30bd29b13011f3faaeb660e9738262b37f3a.tar.bz2 yosys-615b30bd29b13011f3faaeb660e9738262b37f3a.zip | |
Merge pull request #719 from YosysHQ/q3k/flailing-around-trying-to-fix-osx
Fix Travis on OSX
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | .travis/setup.sh | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 321c3325f..8aacbb8b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -134,9 +134,9 @@ matrix: # Latest clang on Mac OS X - os: osx - osx_image: xcode8 + osx_image: xcode9.4 env: - - MATRIX_EVAL="CONFIG=gcc && CC=gcc-7 && CXX=g++-7" + - MATRIX_EVAL="CONFIG=clang && CC=clang && CXX=clang++" before_install: - ./.travis/setup.sh diff --git a/.travis/setup.sh b/.travis/setup.sh index 068515786..d689cd2bd 100755 --- a/.travis/setup.sh +++ b/.travis/setup.sh @@ -64,7 +64,6 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap Homebrew/bundle brew bundle brew install ccache - brew install gcc@7 echo echo -en 'travis_fold:end:before_install.brew\\r' echo |