diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-09-03 21:31:32 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-09-09 18:31:40 -0400 |
| commit | 5aae5b325ccef857800f1840665a0e1b152e9b88 (patch) | |
| tree | 81e00f6fbe87e2c7a69be5084376d29e767a492e /hadrian/build-cabal.bat | |
| parent | 7911d0d983a68eb0d54d7c1ba51326d6be737aae (diff) | |
| download | haskell-5aae5b325ccef857800f1840665a0e1b152e9b88.tar.gz | |
gitlab-ci: Bump Docker images
We now generate our Docker images via Dhall definitions, as described in
ghc/ci-images!52. Additionally, we are far more careful about where tools
come from, using the ALEX, HAPPY, HSCOLOR, and GHC environment variables
(set in the Dockerfiles) to find bootstrapping tools.
Diffstat (limited to 'hadrian/build-cabal.bat')
| -rw-r--r-- | hadrian/build-cabal.bat | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hadrian/build-cabal.bat b/hadrian/build-cabal.bat index ee64694368..1d5d8ecd0e 100644 --- a/hadrian/build-cabal.bat +++ b/hadrian/build-cabal.bat @@ -4,8 +4,12 @@ if "%CABAL%"=="" ( set CABAL=cabal ) +if "%GHC%"=="" ( + set GHC=ghc +) + if "%CABFLAGS%"=="" ( - set CABFLAGS=--disable-documentation --disable-profiling --disable-library-profiling + set CABFLAGS=--with-compiler=%GHC% --disable-documentation --disable-profiling --disable-library-profiling ) rem It is currently more robust to pass Cabal an absolute path to the project file. |