diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2017-09-09 12:15:00 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2017-09-09 12:15:00 +0200 |
| commit | 122f183d47fe46a54d2964111ce269939706b0f8 (patch) | |
| tree | affd7345b82b7876792ba33e34fa3ac104ffc09b /compiler | |
| parent | cf6b4d1c603c0e81eeae8d4e4d8025e84ca5d63b (diff) | |
| download | haskell-122f183d47fe46a54d2964111ce269939706b0f8.tar.gz | |
Remove now redundant cabal conditionals in {ghc,template-haskell}.cabal
In the past we needed the construct below for wired-in packages,
but since GHC 8.0 (which we require at least for stage0 now) the CLI has
stabilised, so we can unconditionally use `-this-unit-id` since GHC 8.0.
if impl( ghc >= 7.11 )
ghc-options: -this-unit-id template-haskell
else
if impl( ghc >= 7.9 )
ghc-options: -this-package-key template-haskell
else
ghc-options: -package-name template-haskell
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/ghc.cabal.in | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 152e15682c..4348d50092 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -49,7 +49,7 @@ Library Default-Language: Haskell2010 Exposed: False - Build-Depends: base >= 4 && < 5, + Build-Depends: base >= 4.9 && < 5, deepseq >= 1.4 && < 1.5, directory >= 1 && < 1.4, process >= 1 && < 1.7, @@ -111,14 +111,8 @@ Library Include-Dirs: . parser utils -- We need to set the unit id to ghc (without a version number) - -- as it's magic. But we can't set it for old versions of GHC (e.g. - -- when bootstrapping) because those versions of GHC don't understand - -- that GHC is wired-in. - if impl ( ghc >= 7.11 ) - GHC-Options: -this-unit-id ghc - else - if impl( ghc >= 7.9 ) - GHC-Options: -this-package-key ghc + -- as it's magic. + GHC-Options: -this-unit-id ghc if flag(stage1) Include-Dirs: stage1 |