[commit: ghc] wip/nfs-locking: Merge pull request #121 from angerman/feature/fix-osx-ci (0fee526)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/0fee526aa68cff1b10d733ba4257fb3435276c66/ghc

>---------------------------------------------------------------

commit 0fee526aa68cff1b10d733ba4257fb3435276c66
Merge: 31fdc6b 7d55b36
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Jan 6 13:47:24 2016 +0000

    Merge pull request #121 from angerman/feature/fix-osx-ci
    
    Let's try the stupid --with-gcc fix for os x.



>---------------------------------------------------------------

0fee526aa68cff1b10d733ba4257fb3435276c66
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)