update submodules for GHC.HetMet.GArrow -> Control.GArrow renaming

[ghc-hetmet.git] / distrib / cross-port

diff --git a/distrib/cross-port b/distrib/cross-port
index a7e4351..690e60b 100644 (file)
--- a/distrib/cross-port
+++ b/distrib/cross-port
@@ -31,10 +31,11 @@ if [ ! -f b1-stamp ]; then
    # the resulting mk/config.h file back into this tree before building
    # the libraries.
 
-   echo "GhcUnregisterised = YES" >> mk/config.mk
-   echo "GhcLibHcOpts = -O -H32m -fvia-C -keep-hc-files" >> mk/config.mk
-   echo "GhcLibWays =" >> mk/config.mk
-   echo "SplitObjs = NO" >> mk/config.mk
+   touch mk/build.mk
+   echo "GhcUnregisterised = YES" >> mk/build.mk
+   echo "GhcLibHcOpts = -O -H32m -fvia-C -keep-hc-files" >> mk/build.mk
+   echo "GhcLibWays =" >> mk/build.mk
+   echo "SplitObjs = NO" >> mk/build.mk
 
    # We could optimise slightly by not building hslibs here.  Also, building
    # the RTS is not necessary (and might not be desirable if we're using
@@ -57,12 +58,18 @@ if [ ! -f b2-stamp ]; then
   cd b2
    ./configure --with-ghc=$base/b1/ghc/compiler/stage1/ghc-inplace
 
-   echo "GhcHcOpts = -O -H32m -fvia-C -keep-hc-files" >> mk/config.mk
-   echo "GhcWithNativeCodeGen = NO" >> mk/config.mk
+   touch mk/build.mk
+   # The bootstrapped compiler should probably generate unregisterised
+   # code too.  If you don't want it to, then comment out this line:
+   echo "GhcUnregisterised = YES" >> mk/build.mk
+   echo "SRC_HC_OPTS += -keep-hc-file -fvia-C" >> mk/build.mk
+   echo "GhcWithNativeCodeGen = NO" >> mk/build.mk
+   echo "GhcWithInterpreter = NO" >> mk/build.mk
 
-   # we just need to build the compiler...
+   # we just need to build the compiler and utils...
    (cd glafp-utils && make boot && make)
    (cd ghc && make boot)
+   (cd ghc/utils && make)
    (cd ghc/compiler && make stage=1)
   cd ..