[commit: ghc] wip/nfs-locking: Add ghc-boot-th package (e91daa3)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 01:01:28 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/e91daa3eb50b46441619d5ba43852c8dc1f9a164/ghc
>---------------------------------------------------------------
commit e91daa3eb50b46441619d5ba43852c8dc1f9a164
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Mon May 16 23:10:48 2016 +0100
Add ghc-boot-th package
>---------------------------------------------------------------
e91daa3eb50b46441619d5ba43852c8dc1f9a164
src/GHC.hs | 17 +++++++++--------
src/Settings/Packages.hs | 4 ++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/GHC.hs b/src/GHC.hs
index 02c76f9..303beca 100644
--- a/src/GHC.hs
+++ b/src/GHC.hs
@@ -2,11 +2,11 @@
module GHC (
array, base, binary, bytestring, cabal, compiler, containers, compareSizes,
deepseq, deriveConstants, directory, dllSplit, filepath, genapply,
- genprimopcode, ghc, ghcBoot, ghcCabal, ghci, ghcPkg, ghcPrim, ghcTags,
- ghcSplit, haddock, haskeline, hsc2hs, hoopl, hp2ps, hpc, hpcBin, integerGmp,
- integerSimple, iservBin, libffi, mkUserGuidePart, parallel, pretty,
- primitive, process, rts, runGhc, stm, templateHaskell, terminfo, time,
- touchy, transformers, unlit, unix, win32, xhtml,
+ genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCabal, ghci, ghcPkg, ghcPrim,
+ ghcTags, ghcSplit, haddock, haskeline, hsc2hs, hoopl, hp2ps, hpc, hpcBin,
+ integerGmp, integerSimple, iservBin, libffi, mkUserGuidePart, parallel,
+ pretty, primitive, process, rts, runGhc, stm, templateHaskell, terminfo,
+ time, touchy, transformers, unlit, unix, win32, xhtml,
defaultKnownPackages, programPath, contextDirectory, rtsContext
) where
@@ -25,7 +25,7 @@ defaultKnownPackages :: [Package]
defaultKnownPackages =
[ array, base, binary, bytestring, cabal, compiler, containers, compareSizes
, deepseq, deriveConstants, directory, dllSplit, filepath, genapply
- , genprimopcode, ghc, ghcBoot, ghcCabal, ghci, ghcPkg, ghcPrim
+ , genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCabal, ghci, ghcPkg, ghcPrim
, ghcTags, haddock, haskeline, hsc2hs, hoopl, hp2ps, hpc, hpcBin, integerGmp
, integerSimple, iservBin, libffi, mkUserGuidePart, parallel, pretty
, primitive, process, rts, runGhc, stm, templateHaskell, terminfo, time
@@ -34,8 +34,8 @@ defaultKnownPackages =
-- | Package definitions, see 'Package'.
array, base, binary, bytestring, cabal, compiler, containers, compareSizes,
deepseq, deriveConstants, directory, dllSplit, filepath, genapply,
- genprimopcode, ghc, ghcBoot, ghcCabal, ghci, ghcPkg, ghcPrim, ghcTags,
- haddock, haskeline, hsc2hs, hoopl, hp2ps, hpc, hpcBin, integerGmp,
+ genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCabal, ghci, ghcPkg, ghcPrim,
+ ghcTags, haddock, haskeline, hsc2hs, hoopl, hp2ps, hpc, hpcBin, integerGmp,
integerSimple, iservBin, libffi, mkUserGuidePart, parallel, pretty,
primitive, process, rts, runGhc, stm, templateHaskell, terminfo, time,
touchy, transformers, unlit, unix, win32, xhtml :: Package
@@ -57,6 +57,7 @@ genapply = utility "genapply"
genprimopcode = utility "genprimopcode"
ghc = topLevel "ghc-bin" `setPath` "ghc" `setType` Program
ghcBoot = library "ghc-boot"
+ghcBootTh = library "ghc-boot-th"
ghcCabal = utility "ghc-cabal"
ghci = library "ghci"
ghcPkg = utility "ghc-pkg"
diff --git a/src/Settings/Packages.hs b/src/Settings/Packages.hs
index 6888d0a..40d9ebf 100644
--- a/src/Settings/Packages.hs
+++ b/src/Settings/Packages.hs
@@ -20,8 +20,8 @@ defaultPackages = mconcat
packagesStage0 :: Packages
packagesStage0 = mconcat
- [ append [ binary, cabal, compiler, ghc, ghcBoot, ghcCabal, ghcPkg
- , hsc2hs, hoopl, hpc, templateHaskell, transformers ]
+ [ append [ binary, cabal, compiler, ghc, ghcBoot, ghcBootTh, ghcCabal
+ , ghcPkg, hsc2hs, hoopl, hpc, templateHaskell, transformers ]
-- the stage0 predicate makes sure these packages are built only in Stage0
, stage0 ? append [ deriveConstants, dllSplit, genapply, genprimopcode
, hp2ps, unlit ]
More information about the ghc-commits
mailing list