Commit f18a58d7 authored by simonmar's avatar simonmar

[project @ 2003-07-25 10:22:25 by simonmar]

Some more revisions; it nearly works on my unregisterised setup now.
parent e1727015
......@@ -26,17 +26,19 @@ fi
# 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..."
......@@ -51,21 +53,24 @@ MAKEFLAGS=
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
......@@ -75,7 +80,7 @@ PRIMOP_BITS="primop-data-decl.hs-incl \
# 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
......
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