[project @ 1998-04-16 12:14:13 by sof]

Added --enable-hc-boot flag for setting up a .hc build tree

diff --git a/configure.in b/configure.in
index 4b5713f..cc4160f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -281,6 +281,19 @@ dnl AC_SUBST(TargetVendor_CPP)
 
 AC_SUBST(exeext)
 
+dnl * Booting from .hc files?
+#--------------------------------------------------------------
+AC_ARG_ENABLE(hc-boot,
+   [
+Boot the Glasgow Haskell Compiler from intermediate .hc files.
+(This option is mostly of interest for porters.)
+   ],
+
+   BootingFromHc=YES,
+   BootingFromHc=NO
+)
+AC_SUBST(BootingFromHc)
+
 # -------------------------------------------------------------------------
 dnl
 dnl * _GENERAL_ CONFIGURATION CHECKS
@@ -399,19 +412,12 @@ fi
 AC_SUBST(CompressCmd)
 AC_SUBST(CompressSuffix)
 
-#
+dnl
 dnl ** check for installed happy binary + version
-#
+dnl    (don't do it if we're booting from .hc files though.)
+if (test "$BootingFromHc" = "NO"); then
 AC_HAPPY
-
-if test x"$HappyCmd" != x; then
-   if expr $HappyVersion \< "1.3" >/dev/null; then
-       echo "   Happy Version 1.3 or later is required to compile GHC."
-       echo "   Using the Happy sources in the tree.";
-       HappyCmd=""
-   fi
-fi
-
+fi;
 #
 #
 dnl ** check for installed lx binary

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 7bd9106..d0e0ce1 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -192,7 +192,7 @@ GhcCompilerWays=
 GhcHcOpts=
 
 # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
-GhcWithHscBuiltViaC=NO
+GhcWithHscBuiltViaC=@BootingFromHc@
 
 # Build hsc with -O and turn optimising flag on when compiling
 # the intermediate C file
@@ -249,11 +249,10 @@ else
 ifeq "$(strip $(way))" "mr"
 GhcLibHcOpts= -O
 else
-ifeq "$(GhcWithHscBuiltViaC)" "NO"
-GhcLibHcOpts= -O -split-objs -odir $*
+ifeq "$(GhcWithHscBuiltViaC)" "YES"
+GhcLibHcOpts=-O
 else
-#NB: .hc files need to distributed in *unsplit* form.
-GhcLibHcOpts= -O
+GhcLibHcOpts=-O -split-objs -odir $*
 endif
 endif
 endif