[commit: ghc] wip/nfs-locking: Build internal ghci support in Stage1 (552bb90)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:46:40 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/552bb90ed6b3408018c8c9952c5c0f1b28323694/ghc

>---------------------------------------------------------------

commit 552bb90ed6b3408018c8c9952c5c0f1b28323694
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Dec 31 01:03:52 2016 +0000

    Build internal ghci support in Stage1


>---------------------------------------------------------------

552bb90ed6b3408018c8c9952c5c0f1b28323694
 hadrian.cabal                 | 1 +
 src/Settings/Default.hs       | 2 ++
 src/Settings/Packages/Ghci.hs | 7 +++++++
 3 files changed, 10 insertions(+)

diff --git a/hadrian.cabal b/hadrian.cabal
index 374b5a0..a186d7d 100644
--- a/hadrian.cabal
+++ b/hadrian.cabal
@@ -91,6 +91,7 @@ executable hadrian
                        , Settings.Packages.Compiler
                        , Settings.Packages.Ghc
                        , Settings.Packages.GhcCabal
+                       , Settings.Packages.Ghci
                        , Settings.Packages.GhcPrim
                        , Settings.Packages.Haddock
                        , Settings.Packages.IntegerGmp
diff --git a/src/Settings/Default.hs b/src/Settings/Default.hs
index ba4ef79..37fcdfa 100644
--- a/src/Settings/Default.hs
+++ b/src/Settings/Default.hs
@@ -31,6 +31,7 @@ import Settings.Packages.Base
 import Settings.Packages.Compiler
 import Settings.Packages.Ghc
 import Settings.Packages.GhcCabal
+import Settings.Packages.Ghci
 import Settings.Packages.GhcPrim
 import Settings.Packages.Haddock
 import Settings.Packages.IntegerGmp
@@ -196,6 +197,7 @@ defaultPackageArgs = mconcat
     , compilerPackageArgs
     , ghcPackageArgs
     , ghcCabalPackageArgs
+    , ghciPackageArgs
     , ghcPrimPackageArgs
     , haddockPackageArgs
     , integerGmpPackageArgs
diff --git a/src/Settings/Packages/Ghci.hs b/src/Settings/Packages/Ghci.hs
new file mode 100644
index 0000000..3d14691
--- /dev/null
+++ b/src/Settings/Packages/Ghci.hs
@@ -0,0 +1,7 @@
+module Settings.Packages.Ghci (ghciPackageArgs) where
+
+import GHC
+import Predicate
+
+ghciPackageArgs :: Args
+ghciPackageArgs = notStage0 ? package ghci ? builder GhcCabal ? arg "--flags=ghci"



More information about the ghc-commits mailing list