#
case "$configopts" in
*--enable-hc-boot-unregisterised*)
-cat >mk/build.mk <<END
+cat >>mk/build.mk <<END
GhcWithInterpreter=NO
GhcWithNativeCodeGen=NO
SplitObjs=NO
;;
*)
-cat >mk/build.mk <<END
+cat >>mk/build.mk <<END
# empty
END
;;
$MAKE -C glafp-utils boot all
$MAKE -C ghc boot
-$MAKE -C libraries boot all
+$MAKE -C libraries boot all GhcBootLibs=YES
$MAKE -C ghc all
MAKEFLAGS=
# Remove the old libraries. Don't use make clean, because we don't
# want to delete the .hs files generated from the .hsc files, because
# we don't have hsc2hs built yet.
-find libraries hslibs | grep '\.\(o\|a\)$' | xargs rm -f
+find libraries hslibs | grep '\.[oa]$' | xargs rm -f
# Do includes and RTS now
$MAKE -C ghc/includes boot && $MAKE -C ghc/includes all
$MAKE -C ghc/rts boot && $MAKE -C ghc/rts all
-# Now build a new set of libraries
-$MAKE -C libraries boot all
+# Now build a new set of libraries (GhcBootLibs only for now)
+$MAKE -C libraries boot all GhcBootLibs=YES
+
+# Build all of ghc/lib
+$MAKE -C ghc/lib clean && $MAKE -C ghc/lib boot all
# Build all of ghc/utils
$MAKE -C ghc/utils clean && $MAKE -C ghc/utils boot all
+# Build the rest of the libraries
+$MAKE -C libraries boot all
+
# Now we can build hslibs (hsc2hs is required, so must be after ghc/utils)
$MAKE -C hslibs boot all