[commit: ghc] wip/nfs-locking: Merge pull request #275 from michalt/compilermode/1 (e89ab5c)

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

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

commit e89ab5c63394d13793b32b391923945154c4c87d
Merge: 4a7016b a8abbc9
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Jul 23 20:03:13 2016 +0200

    Merge pull request #275 from michalt/compilermode/1
    
    Split CompilerMode for GHC and CC



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

e89ab5c63394d13793b32b391923945154c4c87d
 src/Builder.hs                           | 27 +++++++++++++++++----------
 src/Predicate.hs                         |  8 +++++++-
 src/Rules/Compile.hs                     |  6 +++---
 src/Rules/Dependencies.hs                |  4 ++--
 src/Rules/Gmp.hs                         |  2 +-
 src/Rules/Libffi.hs                      |  4 ++--
 src/Rules/Program.hs                     |  2 +-
 src/Rules/Test.hs                        |  4 ++--
 src/Settings/Builders/Cc.hs              |  4 ++--
 src/Settings/Builders/DeriveConstants.hs |  2 +-
 src/Settings/Builders/Ghc.hs             |  8 ++++----
 src/Settings/Builders/GhcCabal.hs        |  6 +++---
 src/Settings/Builders/Hsc2Hs.hs          |  2 +-
 13 files changed, 46 insertions(+), 33 deletions(-)

diff --cc src/Rules/Dependencies.hs
index c64a4e6,94a9542..8aeecf5
--- a/src/Rules/Dependencies.hs
+++ b/src/Rules/Dependencies.hs
@@@ -22,9 -20,8 +22,9 @@@ buildPackageDependencies rs context at Con
          fmap (path ++)
              [ "//*.c.deps", "//*.cmm.deps", "//*.S.deps" ] |%> \out -> do
                  let src = dep2src context out
 +                when (package == integerGmp) (need [gmpLibraryH])
                  need [src]
-                 build $ Target context (Cc FindDependencies stage) [src] [out]
+                 build $ Target context (Cc FindCDependencies stage) [src] [out]
  
          hDepFile %> \out -> do
              srcs <- haskellSources context