[m-rev.] diff: fix bug in tools/bootcheck

[Fergus Henderson]

Estimated hours taken: 0.25
Branches: main

tools/bootcheck:
	Fix a bug: when linking the runtime, trace, etc.
	directories into the stage 3 directory, we need to
	link the stage 2 versions, not the stage 1 versions.
	This is needed in case the stage 2 and stage 1 are
	being compiled in different grades -- the stage 3
	will use the same grade as the stage 2, which may
	be different than the stage 1.	Using the stage 1
	runtime in stage 3 can result in link errors when
	building the stage 3 library due to the grade mismatch.

Workspace: /home/jupiter/fjh/ws-jupiter/mercury
Index: tools/bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.157
diff -u -d -r1.157 bootcheck
--- tools/bootcheck	10 Dec 2003 06:37:39 -0000	1.157
+++ tools/bootcheck	30 Dec 2003 02:02:29 -0000
@@ -889,18 +889,18 @@
 	cp $root/analysis/Mmake* $root/analysis/Mercury.options .
 	$LN_S $root/analysis/$ANALYSIS_LIB_NAME.init .
 	cd $root/$stage3dir
-	$LN_S $root/boehm_gc .
-	$LN_S $root/java .
-	$LN_S $root/mps_gc .
+	$LN_S $root/$stage2dir/boehm_gc .
+	$LN_S $root/$stage2dir/java .
+	$LN_S $root/$stage2dir/mps_gc .
 	$LN_S $root/bindist .
 	$LN_S $root/doc .
-	$LN_S $root/runtime .
-	$LN_S $root/trace .
+	$LN_S $root/$stage2dir/runtime .
+	$LN_S $root/$stage2dir/trace .
 	$LN_S $root/scripts .
 	$LN_S $root/tools .
 	$LN_S $root/util .
-	$LN_S $root/profiler .
-	$LN_S $root/deep_profiler .
+	$LN_S $root/$stage2dir/profiler .
+	$LN_S $root/$stage2dir/deep_profiler .
 	$LN_S $root/conf* .
 	$LN_S $root/aclocal.m4 .
 	$LN_S $root/VERSION .

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------