[commit: ghc] wip/nfs-locking: Make build.bat call the default build script on Windows (build.stack.bat) (f68d527)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:44:56 UTC 2017


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

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

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

commit f68d527a2f040cc16a7f03a5ce25864ed0acaa58
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Oct 23 21:36:37 2017 +0100

    Make build.bat call the default build script on Windows (build.stack.bat)
    
    See #428.
    
    Note that building Hadrian with Cabal currently fails on Windows, hence using Stack.
    
    Also see #440: build.bat may later be relocated to the top of the GHC tree.


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

f68d527a2f040cc16a7f03a5ce25864ed0acaa58
 build.bat                        | 33 ++-------------------------------
 build.bat => build.global-db.bat |  1 -
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/build.bat b/build.bat
index 722f3d7..18cf6cb 100644
--- a/build.bat
+++ b/build.bat
@@ -1,33 +1,4 @@
 @echo off
-setlocal
-cd %~dp0
-mkdir bin 2> nul
 
-set ghcArgs=--make                     ^
-            -Wall                      ^
-            -fno-warn-name-shadowing   ^
-            -XRecordWildCards          ^
-            src\Main.hs                ^
-            -threaded                  ^
-            -isrc                      ^
-            -i..\libraries\Cabal\Cabal ^
-            -rtsopts                   ^
-            -with-rtsopts=-I0          ^
-            -outputdir=bin             ^
-            -j                         ^
-            -O                         ^
-            -o bin\hadrian
-
-set hadrianArgs=--lint      ^
-                --directory ^
-                ".."        ^
-                %*
-
-
-ghc %ghcArgs%
-
-if %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-
-rem Unset GHC_PACKAGE_PATH variable, as otherwise ghc-cabal complains
-set GHC_PACKAGE_PATH=
-bin\hadrian %hadrianArgs%
+rem By default on Windows we build Hadrian using Stack
+./build.stack.bat %*
diff --git a/build.bat b/build.global-db.bat
similarity index 99%
copy from build.bat
copy to build.global-db.bat
index 722f3d7..0d6a696 100644
--- a/build.bat
+++ b/build.global-db.bat
@@ -23,7 +23,6 @@ set hadrianArgs=--lint      ^
                 ".."        ^
                 %*
 
-
 ghc %ghcArgs%
 
 if %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%



More information about the ghc-commits mailing list