[commit: ghc] wip/nfs-locking: Merge pull request #290 from bgamari/master (b7948dd)

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

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

commit b7948dd53ed2fd905c2f9dda6d30ae5280c9fd6f
Merge: d3d00b0 a86f2b1
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Oct 10 00:27:14 2016 +0100

    Merge pull request #290 from bgamari/master
    
    Build mkUserGuidePart with stage-0



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

b7948dd53ed2fd905c2f9dda6d30ae5280c9fd6f
 src/Builder.hs          | 8 ++++++--
 src/GHC.hs              | 5 ++++-
 src/Rules.hs            | 8 +++++++-
 src/Settings/Default.hs | 4 ++--
 4 files changed, 19 insertions(+), 6 deletions(-)