Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tobias Decking
GHC
Commits
b5f2a027
Commit
b5f2a027
authored
Sep 08, 2009
by
Simon Marlow
Browse files
remove --enable-hc-boot-unregisterised (implied by --enable-hc-boot now)
and fix up related cruft
parent
95408c6b
Changes
3
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
b5f2a027
...
...
@@ -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.])],
...
...
ghc.mk
View file @
b5f2a027
...
...
@@ -978,7 +978,7 @@ publish-sdist :
$(
call
nTimes,10,
$(PublishCp)
$(SRC_DIST_TARBALL)
$(PublishLocation)
/dist
)
endif
ifeq
"$(BootingFrom
Unregisterised
Hc)" "YES"
ifeq
"$(BootingFromHc)" "YES"
SRC_CC_OPTS
+=
-DNO_REGS
-DUSE_MINIINTERPRETER
-D__GLASGOW_HASKELL__
=
$(ProjectVersionInt)
endif
...
...
mk/config.mk.in
View file @
b5f2a027
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment