[commit: ghc] wip/nfs-locking: Merge pull request #123 from angerman/feature/fix-clang (4c75d3f)

[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/4c75d3ff0040645fe7107d244ce64b88dbf7010b/ghc

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

commit 4c75d3ff0040645fe7107d244ce64b88dbf7010b
Merge: 79a0bf3 5ccd03c
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Jan 7 13:14:07 2016 +0000

    Merge pull request #123 from angerman/feature/fix-clang
    
    Feature/fix clang



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

4c75d3ff0040645fe7107d244ce64b88dbf7010b
 .travis.yml                 |  3 +--
 README.md                   |  3 ---
 shaking-up-ghc.cabal        |  1 +
 src/Base.hs                 | 11 ++++++++++-
 src/Builder.hs              |  6 +++++-
 src/Oracles.hs              |  2 ++
 src/Oracles/LookupInPath.hs | 32 ++++++++++++++++++++++++++++++++
 src/Rules/Oracles.hs        |  1 +
 8 files changed, 52 insertions(+), 7 deletions(-)