X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fhc-build;h=a645fa34f5eb9aec696d19dc9e69e9340eee347d;hb=d0c6c8b3979e6bd11edba434ccbc61105dcd2537;hp=743b16331c9e46152e97bf953ec2b350c41ffb0e;hpb=8826136c364df69a3d7d8735bf9e1c9c2d5f6df0;p=ghc-hetmet.git

diff --git a/distrib/hc-build b/distrib/hc-build
index 743b163..a645fa3 100644
--- a/distrib/hc-build
+++ b/distrib/hc-build
@@ -29,10 +29,12 @@ fi
 case "$configopts" in
 *--enable-hc-boot-unregisterised*)
 cat >>mk/build.mk <<END
+GhcUnregisterised=YES
 GhcWithInterpreter=NO
 GhcWithNativeCodeGen=NO
 SplitObjs=NO
 GhcLibWays=
+GhcWithSMP=NO
 END
 ;;
 
@@ -46,10 +48,17 @@ esac
 echo "*** Building compiler..."
 ./configure --enable-hc-boot $configopts
 
-$MAKE -C glafp-utils boot all
-$MAKE -C ghc boot
+# 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 ghc all
+$MAKE -C compat boot all
+$MAKE -C utils boot all
+$MAKE -C compiler boot all
 
 MAKEFLAGS=
 
@@ -60,7 +69,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  \
@@ -80,24 +89,24 @@ PRIMOP_BITS="primop-data-decl.hs-incl \
 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/lib
-$MAKE -C ghc/lib clean && $MAKE -C ghc/utils boot all
+# Build all of compat
+$MAKE -C compat clean && $MAKE -C compat boot all
 
-# Build all of ghc/utils
-$MAKE -C ghc/utils clean && $MAKE -C ghc/utils boot all
+# Build all of utils
+$MAKE -C utils clean && $MAKE -C utils boot all
 
-# Now we can build hslibs (hsc2hs is required, so must be after ghc/utils)
-$MAKE -C hslibs  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.