Commit 98cd8ca8 authored by Edward Z. Yang's avatar Edward Z. Yang
Browse files

Fix bootstrapping on GHC 8.0.


Signed-off-by: default avatarEdward Z. Yang <ezyang@cs.stanford.edu>
parent 2a1cbfcd
......@@ -146,7 +146,17 @@ import Distribution.Compat.Internal.TempFile
import Distribution.Compat.Exception
import Distribution.Verbosity
#if __GLASGOW_HASKELL__ < 711
#ifdef VERSION_base
#define BOOTSTRAPPED_CABAL 1
#endif
#else
#ifdef THIS_PACKAGE_KEY
#define BOOTSTRAPPED_CABAL 1
#endif
#endif
#ifdef BOOTSTRAPPED_CABAL
import qualified Paths_Cabal (version)
#endif
......@@ -208,7 +218,7 @@ import System.Process
-- We only get our own version number when we're building with ourselves
cabalVersion :: Version
#if defined(VERSION_base)
#if defined(BOOTSTRAPPED_CABAL)
cabalVersion = Paths_Cabal.version
#elif defined(CABAL_VERSION)
cabalVersion = Version [CABAL_VERSION] []
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment