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

Make template-haskell build with GHC 7.6, fixes bootstrap build.


Signed-off-by: default avatarEdward Z. Yang <ezyang@cs.stanford.edu>

Test Plan: validate on 7.6

Reviewers: austin, goldfire

Subscribers: bgamari, thomie

Differential Revision: https://phabricator.haskell.org/D885
parent 4fffbc34
{-# LANGUAGE CPP, DeriveDataTypeable, PolymorphicComponents, {-# LANGUAGE CPP, DeriveDataTypeable, PolymorphicComponents,
RoleAnnotations, DeriveGeneric, FlexibleInstances #-} DeriveGeneric, FlexibleInstances #-}
#if __GLASGOW_HASKELL__ >= 707
{-# LANGUAGE RoleAnnotations #-}
{-# OPTIONS_GHC -fno-warn-inline-rule-shadowing #-}
#else
{-# OPTIONS_GHC -w #-} -- -fno-warn-inline-rule-shadowing doesn't exist
#endif
#if MIN_VERSION_base(4,8,0) #if MIN_VERSION_base(4,8,0)
#define HAS_NATURAL #define HAS_NATURAL
...@@ -170,7 +177,9 @@ instance Applicative Q where ...@@ -170,7 +177,9 @@ instance Applicative Q where
-- --
----------------------------------------------------- -----------------------------------------------------
#if __GLASGOW_HASKELL__ >= 707
type role TExp nominal -- See Note [Role of TExp] type role TExp nominal -- See Note [Role of TExp]
#endif
newtype TExp a = TExp { unType :: Exp } newtype TExp a = TExp { unType :: Exp }
unTypeQ :: Q (TExp a) -> Q Exp unTypeQ :: Q (TExp a) -> Q Exp
......
...@@ -31,7 +31,6 @@ Library ...@@ -31,7 +31,6 @@ Library
MagicHash MagicHash
PolymorphicComponents PolymorphicComponents
RankNTypes RankNTypes
RoleAnnotations
ScopedTypeVariables ScopedTypeVariables
TemplateHaskell TemplateHaskell
UnboxedTuples UnboxedTuples
...@@ -48,7 +47,7 @@ Library ...@@ -48,7 +47,7 @@ Library
Language.Haskell.TH.Lib.Map Language.Haskell.TH.Lib.Map
build-depends: build-depends:
base >= 4.7 && < 4.9, base >= 4.6 && < 4.9,
pretty == 1.1.* pretty == 1.1.*
-- We need to set the package key to template-haskell (without a -- We need to set the package key to template-haskell (without a
......
...@@ -101,10 +101,6 @@ libraries/base_dist-install_EXTRA_HC_OPTS += -fno-warn-trustworthy-safe ...@@ -101,10 +101,6 @@ libraries/base_dist-install_EXTRA_HC_OPTS += -fno-warn-trustworthy-safe
libraries/ghc-prim_dist-install_EXTRA_HC_OPTS += -fno-warn-trustworthy-safe libraries/ghc-prim_dist-install_EXTRA_HC_OPTS += -fno-warn-trustworthy-safe
libraries/Win32_dist-install_EXTRA_HC_OPTS += -fno-warn-trustworthy-safe libraries/Win32_dist-install_EXTRA_HC_OPTS += -fno-warn-trustworthy-safe
# Temporarely disable inline rule shadowing warning
libraries/template-haskell_dist-boot_EXTRA_HC_OPTS += -fno-warn-inline-rule-shadowing
libraries/template-haskell_dist-install_EXTRA_HC_OPTS += -fno-warn-inline-rule-shadowing
# We need -fno-warn-deprecated-flags to avoid failure with -Werror # We need -fno-warn-deprecated-flags to avoid failure with -Werror
GhcLibExtraHcOpts += -fno-warn-deprecated-flags GhcLibExtraHcOpts += -fno-warn-deprecated-flags
GhcBootLibExtraHcOpts += -fno-warn-deprecated-flags GhcBootLibExtraHcOpts += -fno-warn-deprecated-flags
......
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