[commit: ghc] wip/nfs-locking: Don't fail if configuration file is out-of-date. (d17c1f5)

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

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

commit d17c1f538b14b86405bb0be4f3fc4100a2ec8bec
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Feb 10 13:39:50 2016 +0000

    Don't fail if configuration file is out-of-date.


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

d17c1f538b14b86405bb0be4f3fc4100a2ec8bec
 src/Rules/Setup.hs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/Rules/Setup.hs b/src/Rules/Setup.hs
index a17fb59..e0cd729 100644
--- a/src/Rules/Setup.hs
+++ b/src/Rules/Setup.hs
@@ -21,13 +21,8 @@ setupRules = do
                                   , "download"
                                   , System.Info.arch ]
                 runConfigure "." [] [configureArgs]
-            SkipSetup -> do
-                cfgExists <- doesFileExist cfg
-                if cfgExists
-                then putError $ "Configuration file " ++ cfg ++ " is out-of-date."
-                    ++ "\nRerun the configure script either manually or via the "
-                    ++ "build system by passing --setup[=CONFIGURE_ARGS] flag."
-                else putError $ "Configuration file " ++ cfg ++ " is missing."
+            SkipSetup -> unlessM (doesFileExist cfg) $
+                putError $ "Configuration file " ++ cfg ++ " is missing."
                     ++ "\nRun the configure script either manually or via the "
                     ++ "build system by passing --setup[=CONFIGURE_ARGS] flag."
 
@@ -37,7 +32,7 @@ setupRules = do
             RunSetup _ -> do
                 putBuild "| Running boot..."
                 quietly $ cmd (EchoStdout False) "perl boot"
-            SkipSetup -> do
-                putError $ "The configure script is out-of-date."
+            SkipSetup -> unlessM (doesFileExist "configure") $
+                putError $ "The configure script is missing."
                     ++ "\nRun the boot script either manually or via the "
                     ++ "build system by passing --setup[=CONFIGURE_ARGS] flag."