From 122f183d47fe46a54d2964111ce269939706b0f8 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Sat, 9 Sep 2017 12:15:00 +0200 Subject: 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 --- libraries/template-haskell/template-haskell.cabal | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'libraries') diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal index fcfa448b91..1f01a1579d 100644 --- a/libraries/template-haskell/template-haskell.cabal +++ b/libraries/template-haskell/template-haskell.cabal @@ -51,18 +51,12 @@ Library Language.Haskell.TH.Lib.Map build-depends: - base >= 4.8 && < 4.11, + base >= 4.9 && < 4.11, ghc-boot-th == 8.3, pretty == 1.1.* - -- We need to set the unit ID to template-haskell (without a - -- version number) as it's magic. ghc-options: -Wall - 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 + -- We need to set the unit ID to template-haskell (without a + -- version number) as it's magic. + ghc-options: -this-unit-id template-haskell -- cgit v1.2.1