[commit: ghc] wip/nfs-locking: Run mk/get-win32-tarballs.sh on Windows. (0678acb)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:18:20 UTC 2017


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

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

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

commit 0678acb67ab59b4af9f2401959e1d71ef27d77bc
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Feb 8 23:37:58 2016 +0000

    Run mk/get-win32-tarballs.sh on Windows.
    
    See #204.


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

0678acb67ab59b4af9f2401959e1d71ef27d77bc
 src/Rules/Setup.hs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Rules/Setup.hs b/src/Rules/Setup.hs
index a88084c..ac53592 100644
--- a/src/Rules/Setup.hs
+++ b/src/Rules/Setup.hs
@@ -17,10 +17,13 @@ setupRules = do
             RunConfigure args -> do
                 need [ settings <.> "in", cfgH <.> "in" ]
                 -- 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]
+                when (System.Info.os == "mingw32") $ do
+                    putBuild "| Checking for Windows tarballs..."
+                    quietly $ cmd [ "bash"
+                                  , "mk/get-win32-tarballs.sh"
+                                  , "download"
+                                  , System.Info.arch ]
+                runConfigure "." [] [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