Commit b5f2a027 authored by Simon Marlow's avatar Simon Marlow

remove --enable-hc-boot-unregisterised (implied by --enable-hc-boot now)

and fix up related cruft
parent 95408c6b
......@@ -105,29 +105,6 @@ AC_ARG_ENABLE(hc-boot,
)
AC_SUBST(BootingFromHc)
dnl ** Booting from unregisterised .hc files?
dnl --------------------------------------------------------------
AC_ARG_ENABLE(hc-boot-unregisterised,
[AC_HELP_STRING([--enable-hc-boot-unregisterised],
[ With --enable-hc-boot, treat the intermediate .hc files as
unregisterised rather than registerised code.
(This option is mostly of interest to porters.) [default=no]])],
[ if test x"$enableval" = x"yes"; then
BootingFromUnregisterisedHc=YES
else
BootingFromUnregisterisedHc=NO
fi
],
[BootingFromUnregisterisedHc=NO]
)
AC_SUBST(BootingFromUnregisterisedHc)
if test "$BootingFromHc" = "NO"; then
if test "$BootingFromUnregisterisedHc" = "YES"; then
AC_MSG_ERROR([--enable-hc-boot-unregisterised requires --enable-hc-boot.])
fi;
fi;
AC_ARG_ENABLE(bootstrap-with-devel-snapshot,
[AC_HELP_STRING([--enable-bootstrap-with-devel-snapshot],
[Allow bootstrapping using a development snapshot of GHC. This is not guaranteed to work.])],
......
......@@ -978,7 +978,7 @@ publish-sdist :
$(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist)
endif
ifeq "$(BootingFromUnregisterisedHc)" "YES"
ifeq "$(BootingFromHc)" "YES"
SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
endif
......
......@@ -35,12 +35,9 @@ include $(TOP)/mk/install.mk
################################################################################
# BootingFromHc - build GHC and the libraries from .hc files?
# (unregisterised only)
BootingFromHc = @BootingFromHc@
# BootingFromUnregisterisedHc - treat .hc files as containing unregisterised
# rather than registerised code, i.e., disable the mangler?
BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
NO_INCLUDE_DEPS = NO
NO_INCLUDE_PKGDATA = NO
......
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