[commit: ghc] wip/T16197: Hadrian: Use the Cabal build script on Windows by default (8d594be)

git at git.haskell.org git at git.haskell.org
Thu Jan 17 13:59:16 UTC 2019


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

On branch  : wip/T16197
Link       : http://ghc.haskell.org/trac/ghc/changeset/8d594beff68a6b12cdc8ccbd0cfc3e11cf184bfc/ghc

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

commit 8d594beff68a6b12cdc8ccbd0cfc3e11cf184bfc
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Jan 10 00:18:24 2019 +0000

    Hadrian: Use the Cabal build script on Windows by default
    
    The Stack build script `build.stack.bat` currently fails on Windows
    when invoked with the `--configure` flag, see:
    
    https://ghc.haskell.org/trac/ghc/ticket/15982
    
    The Cabal build script `build.cabal.bat` works reliably on my Windows
    machine, so I am proposing to switch to it by default, that is, to run
    it from the default `build.bat` script.
    
    The Stack build script can still be run directly if need be.


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

8d594beff68a6b12cdc8ccbd0cfc3e11cf184bfc
 hadrian/build.bat | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hadrian/build.bat b/hadrian/build.bat
index 01a869f..e71f886 100644
--- a/hadrian/build.bat
+++ b/hadrian/build.bat
@@ -1,6 +1,4 @@
 @echo off
-setlocal
-cd %~dp0
 
-rem By default on Windows we build Hadrian using Stack
-./build.stack.bat %*
+rem By default on Windows we build Hadrian using Cabal
+hadrian/build.cabal.bat %*



More information about the ghc-commits mailing list