[commit: ghc] wip/nfs-locking: Pass --enable-tarballs-autodownload to configure by default on Windows. (1562315)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 00:17:13 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/1562315b94894f4e8098da8ac35ce2a007f2dc1f/ghc
>---------------------------------------------------------------
commit 1562315b94894f4e8098da8ac35ce2a007f2dc1f
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Fri Feb 5 01:08:31 2016 +0000
Pass --enable-tarballs-autodownload to configure by default on Windows.
See #204.
>---------------------------------------------------------------
1562315b94894f4e8098da8ac35ce2a007f2dc1f
src/Rules/Config.hs | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/Rules/Config.hs b/src/Rules/Config.hs
index 89434cb..1016be9 100644
--- a/src/Rules/Config.hs
+++ b/src/Rules/Config.hs
@@ -1,5 +1,7 @@
module Rules.Config (configRules) where
+import qualified System.Info
+
import Base
import CmdLineFlag
import Rules.Actions
@@ -14,7 +16,11 @@ configRules = do
case cmdConfigure of
RunConfigure args -> do
need [ settings <.> "in", cfgH <.> "in" ]
- runConfigure "." [] [args]
+ -- We cannot use windowsHost here due to a cyclic dependency
+ let defaultArgs = if System.Info.os == "mingw32"
+ then [ "--enable-tarballs-autodownload" ]
+ else []
+ runConfigure "." [] $ defaultArgs ++ [args]
SkipConfigure -> unlessM (doesFileExist cfg) $
putError $ "Configuration file " ++ cfg ++ " is missing.\n"
++ "Run the configure script either manually or via the "
More information about the ghc-commits
mailing list