Unverified Commit 8dba6748 authored by Andrey Mokhov's avatar Andrey Mokhov Committed by GitHub

Add libiserv, rename iserv-bin to iserv, drop primitive (#612)

See https://phabricator.haskell.org/D4436
parent ec5e9d3a
...@@ -5,8 +5,8 @@ module GHC ( ...@@ -5,8 +5,8 @@ module GHC (
containers, deepseq, deriveConstants, directory, filepath, genapply, containers, deepseq, deriveConstants, directory, filepath, genapply,
genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCabal, ghcCompact, ghcHeap, ghci, genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCabal, ghcCompact, ghcHeap, ghci,
ghcPkg, ghcPrim, ghcTags, ghcSplit, haddock, haskeline, hsc2hs, hp2ps, hpc, ghcPkg, ghcPrim, ghcTags, ghcSplit, haddock, haskeline, hsc2hs, hp2ps, hpc,
hpcBin, integerGmp, integerSimple, iservBin, libffi, mtl, parsec, parallel, hpcBin, integerGmp, integerSimple, iserv, libffi, libiserv, mtl, parsec,
pretty, primitive, process, rts, runGhc, stm, templateHaskell, terminfo, parallel, pretty, process, rts, runGhc, stm, templateHaskell, terminfo,
text, time, touchy, transformers, unlit, unix, win32, xhtml, ghcPackages, text, time, touchy, transformers, unlit, unix, win32, xhtml, ghcPackages,
isGhcPackage, defaultPackages, testsuitePackages, isGhcPackage, defaultPackages, testsuitePackages,
...@@ -93,7 +93,8 @@ stage1Packages = do ...@@ -93,7 +93,8 @@ stage1Packages = do
++ [ haddock | not cross ] ++ [ haddock | not cross ]
++ [ runGhc | not cross ] ++ [ runGhc | not cross ]
++ [ hpcBin | not cross ] ++ [ hpcBin | not cross ]
++ [ iservBin | not win, not cross ] ++ [ iserv | not win, not cross ]
++ [ libiserv | not win, not cross ]
++ [ unix | not win ] ++ [ unix | not win ]
++ [ win32 | win ] ++ [ win32 | win ]
...@@ -114,11 +115,11 @@ programName Context {..} = do ...@@ -114,11 +115,11 @@ programName Context {..} = do
targetPlatform <- setting TargetPlatformFull targetPlatform <- setting TargetPlatformFull
let prefix = if cross then targetPlatform ++ "-" else "" let prefix = if cross then targetPlatform ++ "-" else ""
in return $ prefix ++ case package of in return $ prefix ++ case package of
p | p == ghc -> "ghc" p | p == ghc -> "ghc"
| p == hpcBin -> "hpc" | p == hpcBin -> "hpc"
| p == runGhc -> "runhaskell" | p == runGhc -> "runhaskell"
| p == iservBin -> "ghc-iserv" | p == iserv -> "ghc-iserv"
_ -> pkgName package _ -> pkgName package
-- | The build stage whose results are used when installing a package, or -- | The build stage whose results are used when installing a package, or
-- @Nothing@ if the package is not installed, e.g. because it is a user package. -- @Nothing@ if the package is not installed, e.g. because it is a user package.
...@@ -154,16 +155,15 @@ nonCabalContext Context {..} = (package `elem` [ hp2ps ...@@ -154,16 +155,15 @@ nonCabalContext Context {..} = (package `elem` [ hp2ps
-- | Some program packages should not be linked with Haskell main function. -- | Some program packages should not be linked with Haskell main function.
nonHsMainPackage :: Package -> Bool nonHsMainPackage :: Package -> Bool
nonHsMainPackage = (`elem` [ghc, hp2ps, iservBin, touchy, unlit]) nonHsMainPackage = (`elem` [ghc, hp2ps, iserv, touchy, unlit])
-- | Path to the autogen directory generated by @ghc-cabal@ of a given 'Context'. -- | Path to the autogen directory generated by @ghc-cabal@ of a given 'Context'.
autogenPath :: Context -> Action FilePath autogenPath :: Context -> Action FilePath
autogenPath context@Context {..} autogenPath context@Context {..}
| isLibrary package = autogen "build" | isLibrary package = autogen "build"
| package == ghc = autogen "build/ghc" | package == ghc = autogen "build/ghc"
| package == hpcBin = autogen "build/hpc" | package == hpcBin = autogen "build/hpc"
| package == iservBin = autogen "build/iserv" | otherwise = autogen $ "build" -/- pkgName package
| otherwise = autogen $ "build" -/- pkgName package
where where
autogen dir = contextPath context <&> (-/- dir -/- "autogen") autogen dir = contextPath context <&> (-/- dir -/- "autogen")
......
...@@ -15,7 +15,7 @@ ghcPackages = ...@@ -15,7 +15,7 @@ ghcPackages =
, containers, deepseq, deriveConstants, directory, filepath, genapply , containers, deepseq, deriveConstants, directory, filepath, genapply
, genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCompact, ghcHeap, ghci, ghcPkg , genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCompact, ghcHeap, ghci, ghcPkg
, ghcPrim, ghcTags, haddock, haskeline, hsc2hs, hp2ps, hpc, hpcBin, integerGmp , ghcPrim, ghcTags, haddock, haskeline, hsc2hs, hp2ps, hpc, hpcBin, integerGmp
, integerSimple, iservBin, libffi, mtl, parsec, parallel, pretty, primitive , integerSimple, iserv, libffi, libiserv, mtl, parsec, parallel, pretty
, process, rts, runGhc, stm, templateHaskell, terminfo, text, time, touchy , process, rts, runGhc, stm, templateHaskell, terminfo, text, time, touchy
, transformers, unlit, unix, win32, xhtml ] , transformers, unlit, unix, win32, xhtml ]
...@@ -58,8 +58,9 @@ hpc = hsLib "hpc" ...@@ -58,8 +58,9 @@ hpc = hsLib "hpc"
hpcBin = hsUtil "hpc-bin" `setPath` "utils/hpc" hpcBin = hsUtil "hpc-bin" `setPath` "utils/hpc"
integerGmp = hsLib "integer-gmp" integerGmp = hsLib "integer-gmp"
integerSimple = hsLib "integer-simple" integerSimple = hsLib "integer-simple"
iservBin = hsUtil "iserv-bin" `setPath` "iserv" iserv = hsUtil "iserv"
libffi = cTop "libffi" libffi = cTop "libffi"
libiserv = hsLib "libiserv"
mtl = hsLib "mtl" mtl = hsLib "mtl"
parsec = hsLib "parsec" parsec = hsLib "parsec"
parallel = hsLib "parallel" parallel = hsLib "parallel"
......
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