Skip to content

Commit 1fc0675

Browse files
committed
Problme: OSX build does not use clang
Default compiler on OSX is clang so it should be default. Solution: switch from gcc to clang for OSX build.
1 parent 738d44d commit 1fc0675

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

.travis.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,15 @@ env:
2222

2323
matrix:
2424
include:
25+
##########################################################
26+
# Clang on OSX
27+
# Travis takes longer to start OSX instances,
28+
# so leaving it first for the overall build to be faster.
29+
##########################################################
30+
- os: osx
31+
osx_image: xcode9.1
32+
env:
33+
- MATRIX_EVAL="brew install cmake" ZMQ_VERSION=4.2.5 DRAFT=1
2534
# - env: BUILD_TYPE=cmake DO_CLANG_FORMAT_CHECK=1 CLANG_FORMAT=/usr/local/clang-5.0.0/bin/clang-format
2635
# os: linux
2736
# addons:
@@ -39,10 +48,6 @@ matrix:
3948
- g++-7
4049
env:
4150
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" ZMQ_VERSION=4.2.5 DRAFT=1
42-
- os: osx
43-
osx_image: xcode8
44-
env:
45-
- MATRIX_EVAL="brew install cmake gcc && CC=gcc-7 && CXX=g++-7" ZMQ_VERSION=4.2.5 DRAFT=1
4651

4752
sudo: required
4853

@@ -52,6 +57,7 @@ before_install:
5257
# Build and check this project
5358
script:
5459
- eval "${MATRIX_EVAL}"
60+
- cmake --version
5561
- ./ci_build.sh
5662

5763
after_success:

0 commit comments

Comments
 (0)