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

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

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

commit c937606629a97188500bac159d2c8882ccbac3e9
Merge: bd2a394 0afdf64
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Dec 18 23:16:30 2015 +0000

    Merge pull request #2 from bgamari/master
    
    Various fixes



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

c937606629a97188500bac159d2c8882ccbac3e9
 build.sh                     |  6 ++++++
 cfg/system.config.in         | 18 ++++++++++++------
 src/Builder.hs               |  1 +
 src/GHC.hs                   | 22 ++++++++++++----------
 src/Oracles/Config/Flag.hs   |  6 ++++--
 src/Oracles/Dependencies.hs  | 12 ++++++------
 src/Oracles/PackageData.hs   |  6 ++----
 src/Package.hs               |  1 +
 src/Rules.hs                 |  6 +++---
 src/Rules/Compile.hs         | 10 ----------
 src/Rules/Data.hs            | 36 +-----------------------------------
 src/Rules/Generate.hs        |  5 ++++-
 src/Settings/Builders/Ghc.hs | 16 ++++++++--------
 src/Settings/Packages.hs     |  5 +++--
 src/Stage.hs                 |  1 +
 src/Way.hs                   |  3 +++
 16 files changed, 67 insertions(+), 87 deletions(-)