# build configuration
#
-case configopts in
+case "$configopts" in
*--enable-hc-boot-unregisterised*)
- cat >mk/build.mk <<END
- GhcWithInterpreter=NO
- GhcWithNativeCodeGen=NO
- END
- ;;
+cat >mk/build.mk <<END
+GhcWithInterpreter=NO
+GhcWithNativeCodeGen=NO
+END
+;;
+
*)
- cat >mk/build.mk <<END
- # empty
- END
+cat >mk/build.mk <<END
+# empty
+END
+;;
esac
echo "*** Building compiler..."
echo "*** Building libraries..."
+# Get rid of --enable-hc-boot-unregisterised in $configotps if we had it
+configopts=`echo $configopts | sed s/--enable-hc-boot-unregisterised//`
+
# Reconfigure, using the newly-build ghc binary as our $(GHC), and
# with hc bootstrapping disabled.
HappyCmd="$PWD/distrib/fake-happy" ./configure --with-ghc="$PWD/ghc/compiler/ghc-inplace" $configopts
PRIMOP_BITS="primop-data-decl.hs-incl \
- primop-tag.hs-incl \
- primop-list.hs-incl \
- primop-has-side-effects.hs-incl \
- primop-out-of-line.hs-incl \
- primop-commutable.hs-incl \
- primop-needs-wrapper.hs-incl \
- primop-can-fail.hs-incl \
- primop-strictness.hs-incl \
- primop-usage.hs-incl \
- primop-primop-info.hs-incl"
+ primop-tag.hs-incl \
+ primop-list.hs-incl \
+ primop-has-side-effects.hs-incl \
+ primop-out-of-line.hs-incl \
+ primop-commutable.hs-incl \
+ primop-needs-wrapper.hs-incl \
+ primop-can-fail.hs-incl \
+ primop-strictness.hs-incl \
+ primop-usage.hs-incl \
+ primop-primop-info.hs-incl"
# The reconfigure step updates a few files, which can lead to
# unnecessary recompilations. Touch a bunch of things here to avoid
# 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 '\.\(o\|a\)$' | xargs rm -f
# Do includes and RTS now
$MAKE -C ghc/includes boot && $MAKE -C ghc/includes all