-XImpredicativeTypes is only available on GHC 6.10+.
This also pulls out the duplicate -fglasgow-exts.
This commit is contained in:
parent
b006500274
commit
ca1bbbfa47
11
Makefile.am
11
Makefile.am
|
@ -62,13 +62,18 @@ if GHC68
|
|||
#GHC_OPTS += -XTypeSynonymInstances
|
||||
|
||||
GHC_OPTS += -XUndecidableInstances
|
||||
GHC_OPTS += -XImpredicativeTypes
|
||||
GHC_OPTS += -fglasgow-exts
|
||||
GHC_OPTS += -fwarn-tabs -fwarn-monomorphism-restriction
|
||||
else
|
||||
GHC_OPTS += -fglasgow-exts -fallow-undecidable-instances
|
||||
# GHC 6.7 or earlier.
|
||||
GHC_OPTS += -fallow-undecidable-instances
|
||||
endif
|
||||
|
||||
if GHC610
|
||||
GHC_OPTS += -XImpredicativeTypes
|
||||
endif
|
||||
|
||||
GHC_OPTS += -fglasgow-exts
|
||||
|
||||
tock$(EXEEXT): $(BUILT_SOURCES) $(tock_SOURCES) $(config_sources)
|
||||
@MKDIR_P@ obj
|
||||
ghc $(GHC_OPTS) -o tock$(EXEEXT) --make Main -odir obj -hidir obj
|
||||
|
|
|
@ -88,6 +88,7 @@ fi
|
|||
AC_MSG_RESULT([OK])
|
||||
|
||||
AM_CONDITIONAL([GHC68],[test $ghc_version -ge 6008000])
|
||||
AM_CONDITIONAL([GHC610],[test $ghc_version -ge 6010000])
|
||||
|
||||
AC_DEFUN([AC_PICK_HASKELL_LIB_VER],
|
||||
[
|
||||
|
|
Loading…
Reference in New Issue
Block a user