summaryrefslogtreecommitdiff
path: root/hadrian/src/Settings/Default.hs
diff options
context:
space:
mode:
authorAlp Mestanogullari <alpmestan@gmail.com>2020-01-17 11:15:26 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-02-09 02:54:28 -0500
commit3ae83da13f03d22a4d810b5d9c0f37f818cb6a00 (patch)
tree5b96251bc82f06fb42dfe5208800368db5e6e845 /hadrian/src/Settings/Default.hs
parenta906595f060b9c038332f16adaf664eeb1d50f2e (diff)
downloadhaskell-3ae83da13f03d22a4d810b5d9c0f37f818cb6a00.tar.gz
hadrian: Windows fixes (bindists, CI)
This commit implements a few Windows-specific fixes which get us from a CI job that can't even get as far as starting the testsuite driver, to a state where we can run the entire testssuite (but have test failures to fix). - Don't forget about a potential extension for the haddock program, when preparing the bindist. - Build the timeout program, used by the testsuite driver on Windows in place of the Python script used elsewhere, using the boot compiler. We could alternatively build it with the compiler that we're going to test but this would be a lot more tedious to write. - Implement a wrapper-script less installation procedure for Windows, in `hadrian/bindist/Makefile. - Make dependencies a bit more accurate in the aforementioned Makefile. - Update Windows/Hadrian CI job accordingly. This patch fixes #17486.
Diffstat (limited to 'hadrian/src/Settings/Default.hs')
-rw-r--r--hadrian/src/Settings/Default.hs1
1 files changed, 1 insertions, 0 deletions
diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs
index 5bf9ea7e7c..aeac1434db 100644
--- a/hadrian/src/Settings/Default.hs
+++ b/hadrian/src/Settings/Default.hs
@@ -76,6 +76,7 @@ stage0Packages = do
, transformers
, unlit ]
++ [ terminfo | not windowsHost, not cross ]
+ ++ [ timeout | windowsHost ]
++ [ touchy | windowsHost ]
-- | Packages built in 'Stage1' by default. You can change this in "UserSettings".