[commit: ghc] wip/nfs-locking: Merge branch 'master' of https://github.com/snowleopard/shaking-up-ghc (c96b1e9)

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

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

commit c96b1e9f8ffdd430787ee8cd2f016d3474ffba9a
Merge: 9ae96f4 f84ee22
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Sun Jan 10 20:28:45 2016 +0000

    Merge branch 'master' of https://github.com/snowleopard/shaking-up-ghc



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

c96b1e9f8ffdd430787ee8cd2f016d3474ffba9a
 .appveyor.yml                       |  6 +++
 src/Base.hs                         |  2 +
 src/GHC.hs                          | 33 +----------------
 src/Oracles/LookupInPath.hs         | 15 +++-----
 src/Oracles/PackageDeps.hs          |  4 +-
 src/Rules/Compile.hs                |  3 +-
 src/Rules/Config.hs                 |  1 +
 src/Rules/Data.hs                   | 74 +++++++++++++++++++++++++------------
 src/Rules/Dependencies.hs           | 10 ++++-
 src/Rules/Generate.hs               |  6 ++-
 src/Rules/IntegerGmp.hs             |  1 +
 src/Rules/Libffi.hs                 | 10 +++--
 src/Rules/Library.hs                | 13 +++++--
 src/Rules/Program.hs                |  4 +-
 src/Settings/Builders/Ghc.hs        |  3 +-
 src/Settings/Builders/GhcPkg.hs     |  6 ++-
 src/Settings/Builders/HsCpp.hs      |  4 +-
 src/Settings/Default.hs             | 36 +++++++++++++++++-
 src/Settings/Packages/Ghc.hs        |  4 +-
 src/Settings/Packages/IntegerGmp.hs |  1 +
 src/Settings/Packages/IservBin.hs   |  3 +-
 src/Settings/Packages/Rts.hs        |  5 ++-
 src/Settings/TargetDirectory.hs     |  4 +-
 src/Settings/User.hs                | 26 +++++++------
 24 files changed, 167 insertions(+), 107 deletions(-)

diff --cc src/Oracles/LookupInPath.hs
index d573fd7,e75a80d..a9dc995
--- a/src/Oracles/LookupInPath.hs
+++ b/src/Oracles/LookupInPath.hs
@@@ -1,9 -1,8 +1,7 @@@
  {-# LANGUAGE DeriveDataTypeable, GeneralizedNewtypeDeriving #-}
- module Oracles.LookupInPath (
-     lookupInPath, lookupInPathOracle
-     ) where
+ module Oracles.LookupInPath (lookupInPath, lookupInPathOracle) where
  
  import Base
 -import Extra (wordsBy)
  
  newtype LookupInPath = LookupInPath String
      deriving (Show, Typeable, Eq, Hashable, Binary, NFData)