[commit: ghc] ghc-8.0: Remove reexports from ghc-boot, help bootstrap with GHC 8. (bdfb901)

git at git.haskell.org git at git.haskell.org
Mon Oct 10 15:00:41 UTC 2016


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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/bdfb90125009e269b2fbe7f1a7622cc5ca1cd52f/ghc

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

commit bdfb90125009e269b2fbe7f1a7622cc5ca1cd52f
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Sun Oct 2 12:59:44 2016 -0700

    Remove reexports from ghc-boot, help bootstrap with GHC 8.
    
    (cherry picked from commit 940ded858157173e75504e8cb0750f059ffd48b9)


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

bdfb90125009e269b2fbe7f1a7622cc5ca1cd52f
 compiler/ghc.cabal.in                | 1 +
 libraries/ghc-boot/GHC/Lexeme.hs     | 5 -----
 libraries/ghc-boot/ghc-boot.cabal.in | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index b3ac89c..4d5e3b5 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -58,6 +58,7 @@ Library
                    hpc        == 0.6.*,
                    transformers == 0.5.*,
                    ghc-boot   == @ProjectVersionMunged@,
+                   ghc-boot-th == @ProjectVersionMunged@,
                    hoopl      >= 3.10.2 && < 3.11
 
     if os(windows)
diff --git a/libraries/ghc-boot/GHC/Lexeme.hs b/libraries/ghc-boot/GHC/Lexeme.hs
deleted file mode 100644
index ab9310e..0000000
--- a/libraries/ghc-boot/GHC/Lexeme.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-{-# LANGUAGE PackageImports #-}
-
-module GHC.Lexeme ( module X ) where
-
-import "ghc-boot-th" GHC.Lexeme as X
diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in
index da2cb32..6375b8b 100644
--- a/libraries/ghc-boot/ghc-boot.cabal.in
+++ b/libraries/ghc-boot/ghc-boot.cabal.in
@@ -38,7 +38,6 @@ Library
     exposed-modules:
             GHC.LanguageExtensions
             GHC.LanguageExtensions.Type
-            GHC.Lexeme
             GHC.PackageDb
             GHC.Serialized
 



More information about the ghc-commits mailing list