summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjneira <atreyu.bbb@gmail.com>2020-05-02 23:34:43 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-05-24 01:54:42 -0400
commit59182b88aaa72d346b480b6aa14a9244915e1189 (patch)
tree5c7886ed1fdde9a6fc44efe3b185e55c30b88f53
parent63d30e60b9ab76ed48fa9539957e7b29a2a8c611 (diff)
downloadhaskell-59182b88aaa72d346b480b6aa14a9244915e1189.tar.gz
Honour previous values for CABAL and CABFLAGS
The immediate goal is let the hie-bios.bat script set CABFLAGS with `-v0` and remove all cabal output except the compiler arguments
-rw-r--r--hadrian/build-cabal.bat10
1 files changed, 8 insertions, 2 deletions
diff --git a/hadrian/build-cabal.bat b/hadrian/build-cabal.bat
index aa0acab4e4..ee64694368 100644
--- a/hadrian/build-cabal.bat
+++ b/hadrian/build-cabal.bat
@@ -1,6 +1,12 @@
@echo off
-set CABAL=cabal
-set CABFLAGS=--disable-documentation --disable-profiling --disable-library-profiling
+
+if "%CABAL%"=="" (
+ set CABAL=cabal
+)
+
+if "%CABFLAGS%"=="" (
+ set CABFLAGS=--disable-documentation --disable-profiling --disable-library-profiling
+)
rem It is currently more robust to pass Cabal an absolute path to the project file.
set PROJ="%CD%/hadrian/cabal.project"