X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fhc-build;h=0771980b05875d92203d56eef1ba0b40277fee15;hb=9f8e195e69e54c733eb93b2e2e39c2ebe818ce62;hp=e6a132c096c5473d0a3cfebf4dfd8a24a445e8ee;hpb=38e89650554d7851233792ad2d238c2282a628f0;p=ghc-hetmet.git

diff --git a/distrib/hc-build b/distrib/hc-build
index e6a132c..0771980 100644
--- a/distrib/hc-build
+++ b/distrib/hc-build
@@ -28,14 +28,16 @@ fi
 #
 case "$configopts" in
 *--enable-hc-boot-unregisterised*)
-cat >mk/build.mk <<END
+cat >>mk/build.mk <<END
 GhcWithInterpreter=NO
 GhcWithNativeCodeGen=NO
+SplitObjs=NO
+GhcLibWays=
 END
 ;;
 
 *)
-cat >mk/build.mk <<END
+cat >>mk/build.mk <<END
 # empty
 END
 ;;
@@ -44,10 +46,17 @@ esac
 echo "*** Building compiler..."
 ./configure --enable-hc-boot $configopts
 
-$MAKE -C glafp-utils boot all
-$MAKE -C ghc boot
-$MAKE -C libraries boot all
-$MAKE -C ghc all
+# ToDo: figure out the minimal correct sequence here
+$MAKE -C utils/mkdependC boot all
+$MAKE -C utils/unlit boot all
+$MAKE -C utils/mkdirhier boot all
+$MAKE -C driver/mangler boot all
+$MAKE -C includes boot all
+$MAKE -C rts boot all
+$MAKE -C libraries boot all GhcBootLibs=YES
+$MAKE -C compat boot all
+$MAKE -C utils boot all
+$MAKE -C compiler boot all
 
 MAKEFLAGS=
 
@@ -58,7 +67,7 @@ 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
+HappyCmd="$PWD/distrib/fake-happy" ./configure --with-ghc="$PWD/compiler/ghc-inplace" $configopts
 
 PRIMOP_BITS="primop-data-decl.hs-incl \
 	      primop-tag.hs-incl  \
@@ -75,24 +84,27 @@ 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 '\.[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
+$MAKE -C includes boot && $MAKE -C includes all
+$MAKE -C rts      boot && $MAKE -C 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/utils
-$MAKE -C ghc/utils clean && $MAKE -C ghc/utils boot all
+# Build all of compat
+$MAKE -C compat clean && $MAKE -C compat boot all
 
-# Now we can build hslibs (hsc2hs is required, so must be after ghc/utils)
-$MAKE -C hslibs  boot all
+# Build all of utils
+$MAKE -C utils clean && $MAKE -C utils boot all
+
+# Build the rest of the libraries
+$MAKE -C libraries boot all
 
 # The reconfigure step updates a few files, which can lead to
 # unnecessary recompilations.  Touch a bunch of things here to avoid
 # having to recompile stuff that we've already built.
-(cd ghc/compiler; touch $PRIMOP_BITS parser/hschooks.o prelude/PrimOp.o main/Config.hs main/Config.o ghc-*)
+(cd compiler; touch $PRIMOP_BITS stage1/parser/hschooks.o stage1/prelude/PrimOp.o main/Config.hs stage1/main/Config.o stage1/ghc-* ghc-*)
 
-# At this point, the tree should be safe to do 'make install' in.
+# At this point, the tree should be safe to do 'make install stage=1' in.