[commit: ghc] wip/nfs-locking: Merge builder, stagedBuilder, builderGhc/Cc into builder. (e532385)

[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/e53238583d64f7218e57d055651087f594e3a98c/ghc

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

commit e53238583d64f7218e57d055651087f594e3a98c
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Apr 26 01:04:04 2016 +0100

    Merge builder, stagedBuilder, builderGhc/Cc into builder.
    
    See #223.


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

e53238583d64f7218e57d055651087f594e3a98c
 src/Predicates.hs                   | 33 ++++++++++++---------------------
 src/Settings/Builders/Cc.hs         |  6 +++---
 src/Settings/Builders/Ghc.hs        |  8 ++++----
 src/Settings/Builders/GhcCabal.hs   |  2 +-
 src/Settings/Builders/GhcPkg.hs     |  2 +-
 src/Settings/Flavours/Quick.hs      |  4 ++--
 src/Settings/Packages/Compiler.hs   |  4 ++--
 src/Settings/Packages/Directory.hs  |  4 ++--
 src/Settings/Packages/Ghc.hs        |  4 ++--
 src/Settings/Packages/GhcCabal.hs   |  4 ++--
 src/Settings/Packages/Hp2ps.hs      |  4 ++--
 src/Settings/Packages/IntegerGmp.hs |  4 ++--
 src/Settings/Packages/IservBin.hs   |  4 ++--
 src/Settings/Packages/Rts.hs        |  6 +++---
 src/Settings/Packages/RunGhc.hs     |  4 ++--
 src/Settings/Packages/Touchy.hs     |  4 ++--
 src/Settings/Packages/Unlit.hs      |  4 ++--
 src/Settings/User.hs                |  2 +-
 18 files changed, 47 insertions(+), 56 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc e53238583d64f7218e57d055651087f594e3a98c