[commit: ghc] wip/nfs-locking: Depend on GMP only when using integerGmp (4ac02f6)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 01:16:18 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/4ac02f6d213ff80fdb3659fb246688ada9886bbd/ghc

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

commit 4ac02f6d213ff80fdb3659fb246688ada9886bbd
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Jan 8 01:29:35 2017 +0000

    Depend on GMP only when using integerGmp
    
    See #179


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

4ac02f6d213ff80fdb3659fb246688ada9886bbd
 src/Rules/Generate.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Rules/Generate.hs b/src/Rules/Generate.hs
index 5d557b4..51bec60 100644
--- a/src/Rules/Generate.hs
+++ b/src/Rules/Generate.hs
@@ -6,6 +6,7 @@ module Rules.Generate (
 import Base
 import Context hiding (package)
 import Expression
+import Flavour
 import GHC
 import Oracles.ModuleFiles
 import Predicate
@@ -17,6 +18,7 @@ import Rules.Generators.GhcSplit
 import Rules.Generators.GhcVersionH
 import Rules.Generators.VersionHs
 import Rules.Libffi
+import Settings
 import Settings.Path
 import Target
 import UserSettings
@@ -70,7 +72,8 @@ compilerDependencies = do
     mconcat [ return [platformH stage]
             , return includesDependencies
             , return derivedConstantsDependencies
-            , notStage0 ? return (gmpLibraryH : libffiDependencies)
+            , notStage0 ? integerLibrary flavour == integerGmp ? return [gmpLibraryH]
+            , notStage0 ? return libffiDependencies
             , return $ fmap (path -/-)
                   [ "primop-can-fail.hs-incl"
                   , "primop-code-size.hs-incl"



More information about the ghc-commits mailing list