mirror of
https://github.com/cuberite/libevent.git
synced 2025-08-04 01:36:23 -04:00
Merge branch 'travis-ci-osx-fixes'
* travis-ci-osx-fixes: travis-ci/osx: switch to xcode 10.1, since 9.4 is not compatible with gcc-8 travis-ci/osx: install gcc and fix CC (cherry picked from commit 5613bfb8dcd70ea1c89d04b550d9f97958cc48d2)
This commit is contained in:
parent
170debc782
commit
9f02b39ce1
@ -3,6 +3,7 @@ os:
|
|||||||
- osx
|
- osx
|
||||||
sudo: false
|
sudo: false
|
||||||
dist: trusty
|
dist: trusty
|
||||||
|
osx_image: xcode10.1
|
||||||
|
|
||||||
branches:
|
branches:
|
||||||
except:
|
except:
|
||||||
@ -50,7 +51,7 @@ before_install:
|
|||||||
- export TIMEOUT=50
|
- export TIMEOUT=50
|
||||||
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
|
||||||
if [ "$CC" == "gcc" ]; then
|
if [ "$CC" == "gcc" ]; then
|
||||||
export CC=$(ls -t /usr/local/bin/gcc-?.?);
|
export CC=$(ls /usr/local/Cellar/gcc/*/bin/gcc-?);
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export OPENSSL_ROOT=$(echo /usr/local/Cellar/openssl/*);
|
export OPENSSL_ROOT=$(echo /usr/local/Cellar/openssl/*);
|
||||||
@ -82,6 +83,7 @@ addons:
|
|||||||
- openssl
|
- openssl
|
||||||
- lcov
|
- lcov
|
||||||
- libtool
|
- libtool
|
||||||
|
- gcc
|
||||||
|
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user