Wolfgang Jeltsch pushed to branch wip/jeltsch/base-buildable-with-ghc-9-14 at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • libraries/base/src/GHC/Base.hs
    ... ... @@ -140,10 +140,12 @@ module GHC.Base
    140 140
         ) where
    
    141 141
     
    
    142 142
     import GHC.Internal.Base hiding ( NonEmpty(..) )
    
    143
    +import GHC.Internal.Data.NonEmpty ( NonEmpty(..) )
    
    144
    +#if __GLASGOW_HASKELL__ >= 1000
    
    143 145
     import GHC.Internal.Classes
    
    144 146
     import GHC.Internal.CString
    
    145
    -import GHC.Internal.Data.NonEmpty ( NonEmpty(..) )
    
    146 147
     import GHC.Internal.Magic.Dict ( WithDict(..) )
    
    148
    +#endif
    
    147 149
     import GHC.Prim hiding
    
    148 150
       (
    
    149 151
       -- Hide dataToTag# ops because they are expected to break for
    
    ... ... @@ -398,7 +400,9 @@ import GHC.Prim.Ext
    398 400
     import GHC.Prim.PtrEq
    
    399 401
     import GHC.Internal.Err
    
    400 402
     import GHC.Internal.IO (seq#)
    
    403
    +#if __GLASGOW_HASKELL__ >= 1000
    
    401 404
     import GHC.Internal.Magic
    
    405
    +#endif
    
    402 406
     import GHC.Internal.Maybe
    
    403 407
     import GHC.Types hiding (
    
    404 408
       Unit#,