X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fhc-build;h=367cfd6d30944723f563f456aa2736b3bf54a654;hb=f23d940ee5d97f4395bf4f4c87a5b4a6a30af9d8;hp=f64345fbc270a992d30d03ac648f22246841eb53;hpb=f18a58d7185f1bc8b4d01a9d19a0683973eb67e9;p=ghc-hetmet.git

diff --git a/distrib/hc-build b/distrib/hc-build
index f64345f..367cfd6 100644
--- a/distrib/hc-build
+++ b/distrib/hc-build
@@ -31,6 +31,8 @@ case "$configopts" in
 cat >mk/build.mk <<END
 GhcWithInterpreter=NO
 GhcWithNativeCodeGen=NO
+SplitObjs=NO
+GhcLibWays=
 END
 ;;
 
@@ -72,11 +74,6 @@ PRIMOP_BITS="primop-data-decl.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
-# 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-*)
-
 # 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.
@@ -95,7 +92,9 @@ $MAKE -C ghc/utils clean && $MAKE -C ghc/utils boot all
 # Now we can build hslibs (hsc2hs is required, so must be after ghc/utils)
 $MAKE -C hslibs  boot all
 
-# Avoid relinking the compiler during 'make install':
-(cd ghc/compiler; touch parser/hschooks.o ghc-*)
+# 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-*)
 
 # At this point, the tree should be safe to do 'make install' in.