diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2015-11-14 21:17:27 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2015-11-14 21:17:28 +0100 |
| commit | 54884220cd8f68bcb4291cc3689d69258b835f6f (patch) | |
| tree | fe711a2303c4847d22b678effb1cd41a0eefa819 /compiler | |
| parent | 3353f62ab8658346b0084fe6382edeb86d104012 (diff) | |
| download | haskell-54884220cd8f68bcb4291cc3689d69258b835f6f.tar.gz | |
Fix bootstrapping with GHC 7.10.1
Relying on CallStack being in GLASGOW_HASKELL >= 710 breaks
bootstrappability with 7.10.1
7.10.2 added the CallStack mechanism, and GHC already relies on this
while being built. Unfortunately, it is enabled with "GLASGOW_HASKELL
>= 710", which also applies to GHC 7.10.1, which does not have
CallStack, and fails building the stage-1 compiler because the symbol
is not found.
This patch makes the CPP directive more strict, requiring **more than**
7.10 instead of **at least**.
Reviewers: jstolarek, austin, bgamari
Reviewed By: bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1472
GHC Trac Issues: #11085
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/utils/Outputable.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/utils/Outputable.hs b/compiler/utils/Outputable.hs index db584694d1..83febd5d04 100644 --- a/compiler/utils/Outputable.hs +++ b/compiler/utils/Outputable.hs @@ -111,8 +111,10 @@ import Data.Graph (SCC(..)) import GHC.Fingerprint import GHC.Show ( showMultiLineString ) +#if __GLASGOW_HASKELL__ > 710 import GHC.Stack import GHC.Exception +#endif {- ************************************************************************ @@ -1042,7 +1044,7 @@ pprTrace str doc x -- | If debug output is on, show some 'SDoc' on the screen along -- with a call stack when available. -#if __GLASGOW_HASKELL__ >= 710 +#if __GLASGOW_HASKELL__ > 710 pprSTrace :: (?location :: CallStack) => SDoc -> a -> a pprSTrace = pprTrace (showCallStack ?location) #else |