Remove reexports from ghc-boot, help bootstrap with GHC 8.
authorEdward Z. Yang <ezyang@cs.stanford.edu>
Sun, 2 Oct 2016 19:59:44 +0000 (12:59 -0700)
committerBen Gamari <ben@smart-cactus.org>
Mon, 10 Oct 2016 14:10:22 +0000 (10:10 -0400)
(cherry picked from commit 940ded858157173e75504e8cb0750f059ffd48b9)

compiler/ghc.cabal.in
libraries/ghc-boot/GHC/Lexeme.hs [deleted file]
libraries/ghc-boot/ghc-boot.cabal.in

index b3ac89c..4d5e3b5 100644 (file)
@@ -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 (file)
index ab9310e..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{-# LANGUAGE PackageImports #-}
-
-module GHC.Lexeme ( module X ) where
-
-import "ghc-boot-th" GHC.Lexeme as X
index da2cb32..6375b8b 100644 (file)
@@ -38,7 +38,6 @@ Library
     exposed-modules:
             GHC.LanguageExtensions
             GHC.LanguageExtensions.Type
-            GHC.Lexeme
             GHC.PackageDb
             GHC.Serialized