Commit b719831c authored by simonmar's avatar simonmar

[project @ 2002-05-22 09:02:40 by simonmar]

We don't pass --old-ghc to Happy any more.  Also, wire $(HappyOpts) to
-agc in config.mk rather than passing it through from configure, since
it was always the same anyhow.
parent f3b127ac
dnl $Id: aclocal.m4,v 1.101 2002/05/17 09:03:13 simonmar Exp $
dnl $Id: aclocal.m4,v 1.102 2002/05/22 09:02:40 simonmar Exp $
dnl
dnl Extra autoconf macros for the Glasgow fptools
dnl
......@@ -220,24 +220,6 @@ if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Parser.hs; then
fi
HappyVersion=$fptools_cv_happy_version;
AC_SUBST(HappyVersion)
# 1.9 and later is required, assume that we can use the
# "-agc" options. NOTE: The Master of Happy-ness says:
# "Don't use -s! (yet)"
HappyOpts="-agc"
# Soon version 1.13 will be required. To give people a chance to
# switch over (and me a chance to actually release 1.13 :-) , we have
# a dummy copy of GlaExts in fptools/libraries/base.
#
# If 1.13 actually is installed, we turn on the --old-ghc option for
# the time being.
FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_happy_version],-ge,[1.13],
[HappyOpts="--old-ghc -ac"])
AC_SUBST(HappyOpts)
])
dnl
......
......@@ -840,7 +840,7 @@ HAPPY_VERSION = @HappyVersion@
#
# Options to pass to Happy when we're going to compile the output with GHC
#
GHC_HAPPY_OPTS = @HappyOpts@
GHC_HAPPY_OPTS = -agc
#
# Stuff from fptools/literate
......
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