Commit 329b02ee authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Remove ghc_ge_504 (it's required to be true now anyway)

parent f03a7287
......@@ -712,12 +712,10 @@ if test "$WithGhc" != ""; then
AC_SUBST(GhcPatchLevel)dnl
GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
if test $GhcCanonVersion -ge 504; then ghc_ge_504=YES; else ghc_ge_504=NO; fi
if test $GhcCanonVersion -ge 601; then ghc_ge_601=YES; else ghc_ge_601=NO; fi
if test $GhcCanonVersion -ge 602; then ghc_ge_602=YES; else ghc_ge_602=NO; fi
if test $GhcCanonVersion -ge 603; then ghc_ge_603=YES; else ghc_ge_603=NO; fi
if test $GhcCanonVersion -ge 605; then ghc_ge_605=YES; else ghc_ge_605=NO; fi
AC_SUBST(ghc_ge_504)dnl
AC_SUBST(ghc_ge_601)dnl
AC_SUBST(ghc_ge_602)dnl
AC_SUBST(ghc_ge_603)dnl
......
......@@ -817,7 +817,6 @@ GhcPatchLevel = @ProjectPatchLevel@
GhcMajVersion = @GhcMajVersion@
GhcMinVersion = @GhcMinVersion@
ghc_ge_504 = YES
ghc_ge_601 = YES
ghc_ge_602 = YES
ghc_ge_603 = YES
......@@ -833,7 +832,6 @@ GhcMajVersion = @GhcMajVersion@
GhcMinVersion = @GhcMinVersion@
# Some useful GHC version predicates:
ghc_ge_504 = @ghc_ge_504@
ghc_ge_601 = @ghc_ge_601@
ghc_ge_602 = @ghc_ge_602@
ghc_ge_603 = @ghc_ge_603@
......
......@@ -8,10 +8,6 @@ ifneq "$(BootingFromHc)" "YES"
boot :: all
endif
ifeq "$(ghc_ge_504)" "NO"
SRC_HC_OPTS += -package lang -package util -package text
endif
ifeq "$(GhcUnregisterised)" "YES"
SRC_HC_OPTS += -DNO_REGS
endif
......
......@@ -19,10 +19,6 @@ SRC_HC_OPTS += $(PACKAGE_CABAL)
# we must also build with $(GhcHcOpts) here:
SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts)
ifeq "$(ghc_ge_504)" "NO"
SRC_HC_OPTS += -package lang -package util -package text
endif
# On Windows, ghc-pkg is a standalone program
# ($bindir/ghc-pkg.exe), whereas on Unix it needs a wrapper script
# to pass the appropriate flag to the real binary
......
......@@ -23,10 +23,6 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-cygwinw32"
HS_PROG = hsc2hs$(exeext)
endif
ifeq "$(ghc_ge_504)" "NO"
SRC_HC_OPTS += -package util
endif
# Note: Somehow we should pass $(exeext) here, but the history of changes used
# for calling the C preprocessor via GHC has changed a few times, making a
# clean solution impossible. So we revert to a hack in Main.hs...
......
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