[m-rev.] for review: change behaviour of bootcheck --use-mmc-make

[Peter Wang]

Estimated hours taken: 1
Branches: main

tools/bootcheck:
	Make the `--use-mmc-make' and `--use-subdirs' options to the bootcheck
	script affect the stage 1 compiler.  Previously it affected stages 2
	and 3 only.

	This means if you built the stage 1 compiler with `mmake
	--use-mmc-make' then you can avoid rebuilding it when it comes time to
	bootcheck by running `bootcheck --use-mmc-make'.  On the other hand,
	you lose the ability to build the stage 1 compiler with plain `mmake'
	but stages 2 and 3 with `mmake --use-mmc-make'.
    

NB.  I think this patch is not strictly necessary.  I haven't tested, but if
you build the stage 1 compiler with `mmake --use-mmc-make', then I think you
can already avoid rebuilding the stage 1 compiler by running bootcheck with
"tools/bootcheck --use-mmc-make -m --use-mmc-make".

Index: tools/bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.178
diff -u -r1.178 bootcheck
--- tools/bootcheck	16 Dec 2005 05:49:40 -0000	1.178
+++ tools/bootcheck	11 Jan 2006 02:49:35 -0000
@@ -404,12 +404,7 @@
 fi
 
 case $use_subdirs in
-    yes)
-        # Since stage1 may not use subdirs, we don't want to link the stage1
-        # slice, profiler and deep_profiler directories into a stage2 that
-        # does, because that would cause the unwanted creation of Mercury
-        # subdirectories in the stage1 directories.
-        copy_profilers=true
+   yes)
         cs_subdir=Mercury/cs/
         ss_subdir=Mercury/ss/
         ils_subdir=Mercury/ils/
@@ -421,15 +416,6 @@
         ;;
 esac
 
-case $use_mmc_make in
-    yes)
-        # Since stage1 may not use mmc_make, we don't want to link the stage1
-        # slice, profiler and deep_profiler directories into a stage2 that
-        # does, for similar reasons to the block of code above.
-        copy_profilers=true
-        ;;
-esac
-
 case $target in
     c)
         target_ext=c
@@ -560,6 +546,12 @@
 
 NEW_MERCURY_OPTIONS="$MERCURY_OPTIONS --mdb-disable-progress"
 
+MMAKE_USE_SUBDIRS=$use_subdirs
+export MMAKE_USE_SUBDIRS
+
+MMAKE_USE_MMC_MAKE=$use_mmc_make
+export MMAKE_USE_MMC_MAKE
+
 if $do_bootcheck
 then
     MERCURY_OPTIONS="$ORIG_MERCURY_OPTIONS"
@@ -580,16 +572,6 @@
         fi
     fi
 
-    # Don't set MMAKE_USE_SUBDIRS and MMAKE_USE_MMC_MAKE until after
-    # we have finished making stage1, because $use_subdirs and $use_mmc_make
-    # come from options that are intended to affect only stages 2 and 3.
-
-    MMAKE_USE_SUBDIRS=$use_subdirs
-    export MMAKE_USE_SUBDIRS
-
-    MMAKE_USE_MMC_MAKE=$use_mmc_make
-    export MMAKE_USE_MMC_MAKE
-
     MERCURY_OPTIONS="$NEW_MERCURY_OPTIONS"
     export MERCURY_OPTIONS
 
@@ -1386,16 +1368,6 @@
     diff_status=0
     check_namespace_status=0
     echo "building of stages 1 and 2 skipped"
-
-    # Don't set MMAKE_USE_SUBDIRS and MMAKE_USE_MMC_MAKE until after
-    # we have finished making stage1, because $use_subdirs and $use_mmc_make
-    # come from options that are intended to affect only stages 2 and 3.
-
-    MMAKE_USE_SUBDIRS=$use_subdirs
-    export MMAKE_USE_SUBDIRS
-
-    MMAKE_USE_MMC_MAKE=$use_mmc_make
-    export MMAKE_USE_MMC_MAKE
 fi
 
 #-----------------------------------------------------------------------------#
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------