From 9f02b39ce10b3cca9961dcba3d83113225042f3e Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <azat@libevent.org>
Date: Mon, 28 Jan 2019 22:19:20 +0300
Subject: [PATCH] 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)
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a25b78ff..5cf9ed30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ os:
   - osx
 sudo: false
 dist: trusty
+osx_image: xcode10.1
 
 branches:
   except:
@@ -50,7 +51,7 @@ before_install:
   - export TIMEOUT=50
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
       if [ "$CC" == "gcc" ]; then
-        export CC=$(ls -t /usr/local/bin/gcc-?.?);
+        export CC=$(ls /usr/local/Cellar/gcc/*/bin/gcc-?);
       fi
 
       export OPENSSL_ROOT=$(echo /usr/local/Cellar/openssl/*);
@@ -82,6 +83,7 @@ addons:
     - openssl
     - lcov
     - libtool
+    - gcc
 
 
 script: