The osx/gcc build on travis actually uses gcc
This commit is contained in:
parent
64d26c2f6e
commit
271cb0c42d
@ -22,8 +22,10 @@ addons:
|
||||
- libcrypto++-dev
|
||||
- libfuse-dev
|
||||
install:
|
||||
# Use new clang
|
||||
# Use new clang on linux
|
||||
- if [ "${TRAVIS_OS_NAME}" == "linux" ] && [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
|
||||
# If using gcc on mac, actually use it ("gcc" just links to clang, but "gcc-4.8" is gcc, https://github.com/travis-ci/travis-ci/issues/2423)
|
||||
- if [ "${TRAVIS_OS_NAME}" == "osx" ] && ["${CXX}" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
|
||||
# Detect number of CPU cores
|
||||
- export NUMCORES=`grep -c ^processor /proc/cpuinfo` && if [ ! -n "$NUMCORES" ]; then export NUMCORES=`sysctl -n hw.ncpu`; fi
|
||||
- echo Using $NUMCORES cores
|
||||
|
Loading…
Reference in New Issue
Block a user