Commit 58a4ddef authored by Alp Mestanogullari's avatar Alp Mestanogullari Committed by Marge Bot

hadrian: build (and ship) iserv on Windows

parent d8d73d77
......@@ -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
]
......@@ -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
......
......@@ -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 ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment