summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-03 15:25:08 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-03 15:25:08 +0000
commit273af33537ae930fadf926182cff1289bed6189b (patch)
tree049f733fec6c3945a6d081955c3b5496deb81bd1
parentb9831d214107ea90f81bc8d10003381e745ce479 (diff)
* .travis.yml: removed needless preparation for gcc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml1
-rw-r--r--ChangeLog4
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 45491b37c81..154c2ff16db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,6 @@ 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"
diff --git a/ChangeLog b/ChangeLog
index 0c50dc29701..024330adf94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct 4 00:25:04 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * .travis.yml: removed needless preparation for gcc.
+
Fri Oct 3 23:41:20 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* .travis.yml: enabled gcc build with osx on travis.