From 5eed468b8a3af05224be6241b398a14d06700caa Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 3 Oct 2014 14:41:26 +0000
Subject: * .travis.yml: enabled gcc build with osx on travis.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 .travis.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 7a0b93c650..45491b37c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,11 +29,6 @@ os:
   - linux
   - osx
 
-matrix:
-  exclude:
-    - os: osx
-      compiler: gcc
-
 # Dependencies.  Some  header files are missing  in a Travis' worker  VM, so we
 # have  to install  them.  The  "1.9.1" here  is OK.   It is  the  most adopted
 # version string  for Debian/Ubuntu, and  no dependencies have been  changed so
@@ -44,6 +39,8 @@ before_install:
   - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then JOBS='-j'; fi"
   - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then brew install autoconf openssl; fi"
   - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then OPENSSL_FLAG=\"--with-openssl-dir=`brew --prefix openssl`\"; fi"
+  - "if [[ $TRAVIS_OS_NAME = 'osx' && $CC = 'gcc' ]]; then brew install gcc; fi"
+  - "if [[ $TRAVIS_OS_NAME = 'osx' && $CC = 'gcc' ]]; then CC='gcc-4.9'; fi"
 install: "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null; fi"
 
 # Script is where the test runs.  Note  we just do "make test", not other tests
-- 
cgit v1.2.3