diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-03 14:41:26 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-03 14:41:26 +0000 |
| commit | 5eed468b8a3af05224be6241b398a14d06700caa (patch) | |
| tree | 3b2edf95c5db1bdc8549dd8c2bcd3b319aad27df /.travis.yml | |
| parent | 438fb66969ccecfbfe838c6a4a3a4ad3d7be1db0 (diff) | |
| download | ruby-5eed468b8a3af05224be6241b398a14d06700caa.tar.gz | |
* .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
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 2 insertions, 5 deletions
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 |