File tree Expand file tree Collapse file tree 2 files changed +1
-22
lines changed Expand file tree Collapse file tree 2 files changed +1
-22
lines changed Original file line number Diff line number Diff line change @@ -421,7 +421,6 @@ library
421421 Distribution.Simple.GHC.IPI642
422422 Distribution.Simple.GHC.IPIConvert
423423 Distribution.Simple.GHC.ImplInfo
424- Paths_Cabal
425424
426425 if flag(bundled-binary-generic)
427426 other-modules :
Original file line number Diff line number Diff line change @@ -189,20 +189,6 @@ import Distribution.Compat.Stack
189189import Distribution.Verbosity
190190import Distribution.Types.PackageId
191191
192- #if __GLASGOW_HASKELL__ < 711
193- #ifdef VERSION_base
194- #define BOOTSTRAPPED_CABAL 1
195- #endif
196- #else
197- #ifdef CURRENT_PACKAGE_KEY
198- #define BOOTSTRAPPED_CABAL 1
199- #endif
200- #endif
201-
202- #ifdef BOOTSTRAPPED_CABAL
203- import qualified Paths_Cabal (version )
204- #endif
205-
206192import Control.Concurrent.MVar
207193 ( newEmptyMVar , putMVar , takeMVar )
208194import Data.Typeable
@@ -244,13 +230,7 @@ import qualified Text.PrettyPrint as Disp
244230
245231-- We only get our own version number when we're building with ourselves
246232cabalVersion :: Version
247- #if defined(BOOTSTRAPPED_CABAL)
248- cabalVersion = mkVersion' Paths_Cabal. version
249- #elif defined(CABAL_VERSION)
250- cabalVersion = mkVersion [CABAL_VERSION ]
251- #else
252- cabalVersion = mkVersion [1 ,9999 ] -- used when bootstrapping
253- #endif
233+ cabalVersion = mkVersion [2 ,2 ]
254234
255235-- ----------------------------------------------------------------------------
256236-- Exception and logging utils
You can’t perform that action at this time.
0 commit comments