[commit: ghc] wip/nfs-locking: Track mk/config.h (af2d086)
git at git.haskell.org
git at git.haskell.org
Thu Oct 26 23:58:42 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/af2d08616055124477b86b14f9f602b2c306a768/ghc
>---------------------------------------------------------------
commit af2d08616055124477b86b14f9f602b2c306a768
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Tue Feb 2 15:41:50 2016 +0000
Track mk/config.h
See #200.
>---------------------------------------------------------------
af2d08616055124477b86b14f9f602b2c306a768
src/Rules/Config.hs | 5 +++--
src/Rules/Generators/GhcAutoconfH.hs | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/Rules/Config.hs b/src/Rules/Config.hs
index eea61c6..f258674 100644
--- a/src/Rules/Config.hs
+++ b/src/Rules/Config.hs
@@ -3,16 +3,17 @@ module Rules.Config (configRules) where
import Base
import CmdLineFlag
import Rules.Actions
+import Rules.Generators.GhcAutoconfH
configRules :: Rules ()
configRules = do
-- We always rerun the configure script in this mode, because the flags
-- passed to it can affect the contents of system.config file.
- [configFile, "settings"] &%> \[cfg, settings] -> do
+ [configFile, "settings", configH] &%> \[cfg, settings, cfgH] -> do
alwaysRerun
case cmdConfigure of
RunConfigure args -> do
- need [ settings <.> "in" ]
+ need [ settings <.> "in", cfgH <.> "in" ]
runConfigure "." [] [args]
SkipConfigure -> unlessM (doesFileExist cfg) $
putError $ "Configuration file " ++ cfg ++ " is missing.\n"
diff --git a/src/Rules/Generators/GhcAutoconfH.hs b/src/Rules/Generators/GhcAutoconfH.hs
index d6e783f..9d93744 100644
--- a/src/Rules/Generators/GhcAutoconfH.hs
+++ b/src/Rules/Generators/GhcAutoconfH.hs
@@ -1,4 +1,4 @@
-module Rules.Generators.GhcAutoconfH (generateGhcAutoconfH) where
+module Rules.Generators.GhcAutoconfH (generateGhcAutoconfH, configH) where
import Base
import Expression
More information about the ghc-commits
mailing list