[commit: ghc] wip/nfs-locking: Force integerGmp package to be configured before reading config.mk file, see #103. (a33ab01)

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

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

commit a33ab012f0e9e997035d7bd6c3ce0535cc9cbed2
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jan 5 19:35:34 2016 +0000

    Force integerGmp package to be configured before reading config.mk file, see #103.


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

a33ab012f0e9e997035d7bd6c3ce0535cc9cbed2
 src/Rules/IntegerGmp.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Rules/IntegerGmp.hs b/src/Rules/IntegerGmp.hs
index 91ca074..f86371c 100644
--- a/src/Rules/IntegerGmp.hs
+++ b/src/Rules/IntegerGmp.hs
@@ -6,6 +6,7 @@ import GHC
 import Oracles.Config.Setting
 import Rules.Actions
 import Settings.User
+import Settings.TargetDirectory
 
 integerGmpBase :: FilePath
 integerGmpBase = "libraries/integer-gmp/gmp"
@@ -104,6 +105,7 @@ integerGmpRules = do
 
         -- check whether we need to build in tree gmp
         -- this is indicated by line "HaveFrameworkGMP = YES" in `config.mk`
+        need [pkgDataFile Stage1 integerGmp]
         configMk <- liftIO . readFile $ integerGmpBase -/- "config.mk"
         if "HaveFrameworkGMP = YES" `isInfixOf` configMk
         then do