diff options
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/src/Rules/BinaryDist.hs | 13 | ||||
| -rw-r--r-- | hadrian/src/Rules/Test.hs | 18 | ||||
| -rw-r--r-- | hadrian/src/Settings/Default.hs | 4 |
3 files changed, 16 insertions, 19 deletions
diff --git a/hadrian/src/Rules/BinaryDist.hs b/hadrian/src/Rules/BinaryDist.hs index 8ec3ea137d..d52e0c847c 100644 --- a/hadrian/src/Rules/BinaryDist.hs +++ b/hadrian/src/Rules/BinaryDist.hs @@ -304,10 +304,9 @@ ghciScriptWrapper = unlines -- explicitly and 'need' the result of building them. needIservBins :: Action () needIservBins = do - when (not windowsHost) $ do - rtsways <- interpretInContext (vanillaContext Stage1 ghc) getRtsWays - need =<< traverse programPath - [ Context Stage1 iserv w - | w <- [vanilla, profiling, dynamic] - , w `elem` rtsways - ] + rtsways <- interpretInContext (vanillaContext Stage1 ghc) getRtsWays + need =<< traverse programPath + [ Context Stage1 iserv w + | w <- [vanilla, profiling, dynamic] + , w `elem` rtsways + ] diff --git a/hadrian/src/Rules/Test.hs b/hadrian/src/Rules/Test.hs index 3c821adf53..d4a528445b 100644 --- a/hadrian/src/Rules/Test.hs +++ b/hadrian/src/Rules/Test.hs @@ -180,16 +180,14 @@ stageOf _ = error "unexpected stage argument" needIservBins :: Action () needIservBins = do - -- iserv is not supported under Windows - when (not windowsHost) $ do - testGhc <- testCompiler <$> userSetting defaultTestArgs - let stg = stageOf testGhc - rtsways <- interpretInContext (vanillaContext stg ghc) getRtsWays - need =<< traverse programPath - [ Context stg iserv w - | w <- [vanilla, profiling, dynamic] - , w `elem` rtsways - ] + testGhc <- testCompiler <$> userSetting defaultTestArgs + let stg = stageOf testGhc + rtsways <- interpretInContext (vanillaContext stg ghc) getRtsWays + need =<< traverse programPath + [ Context stg iserv w + | w <- [vanilla, profiling, dynamic] + , w `elem` rtsways + ] pkgFile :: Stage -> Package -> Action FilePath pkgFile stage pkg diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs index aeac1434db..b0d0f04ab3 100644 --- a/hadrian/src/Settings/Default.hs +++ b/hadrian/src/Settings/Default.hs @@ -112,8 +112,8 @@ stage1Packages = do ] ++ [ haddock | not cross ] ++ [ hpcBin | not cross ] - ++ [ iserv | not windowsHost, not cross ] - ++ [ libiserv | not windowsHost, not cross ] + ++ [ iserv | not cross ] + ++ [ libiserv | not cross ] ++ [ runGhc | not cross ] ++ [ touchy | windowsHost ] ++ [ unix | not windowsHost ] |