[m-dev.] diff: fixes to tools/bootcheck

[Fergus Henderson]

Estimated hours taken: 1

tools/bootcheck:
	- Delete the hard-coded test which assumed that the file
	  system on `hg' doesn't support linkds, since now it does.
	- Use `mmake dep_*' rather than `mmake depend_*'.
	  This avoids unnecessary work when building with
	  the `--keep-stage-{2,3}' options, and has no effect
	  otherwise.  (If you want to use `--keep-stage-{2,3}', but for
	  some reason you want to force rebuilding of the dependencies,
	  you can always just delete the `.dep' file.)
	- Include `-I.../library' in the CFLAGS when running the tests,
	  since that is needed for the MLDS back-end.

Workspace: /home/pgrad/fjh/ws/hg
Index: tools/bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.95
diff -u -d -r1.95 bootcheck
--- tools/bootcheck	2000/04/19 09:32:08	1.95
+++ tools/bootcheck	2000/05/15 16:45:48
@@ -227,11 +227,12 @@
 
 #-----------------------------------------------------------------------------#
 
-# on hg, the file system we're using does not support links
-case `hostname` in
-	hg*)	LN="cp -r"; LN_S="cp -r" ;;
-	*)	LN="ln"; LN_S="ln -s" ;;
-esac
+LN="ln"
+LN_S="ln -s"
+
+# uncomment this code if the file system doesn't support links
+### LN="cp -r"
+### LN_S="cp -r"
 
 #-----------------------------------------------------------------------------#
 
@@ -429,8 +430,8 @@
 		exit 1
 	fi
 
-	if (cd stage2 && $MMAKE $mmake_opts depend_library depend_browser \
-		depend_compiler depend_profiler)
+	if (cd stage2 && $MMAKE $mmake_opts dep_library dep_browser \
+		dep_compiler dep_profiler)
 	then
 		echo "building of stage 2 dependencies successful"
 	else
@@ -582,8 +583,8 @@
 		cp /dev/null "$type_stats"
 	fi
 
-	if (cd stage3 && $MMAKE $mmake_opts depend_library depend_browser \
-		depend_compiler)
+	if (cd stage3 && $MMAKE $mmake_opts dep_library dep_browser \
+		dep_compiler)
 	then
 		echo "building of stage 3 dependencies successful"
 	else
@@ -731,11 +732,13 @@
 	export MERCURY_LIBS
 
 	MERCURY_ALL_C_INCL_DIRS="-I$root/${stage2_insert}trace
+		-I$root/${stage2_insert}library
 		-I$root/${stage2_insert}runtime
 		-I$root/${stage2_insert}boehm_gc
 		-I$root/${stage2_insert}boehm_gc/include"
 	export MERCURY_ALL_C_INCL_DIRS
 	MERCURY_ALL_MC_C_INCL_DIRS="--c-include-directory $root/${stage2_insert}trace
+		--c-include-directory $root/${stage2_insert}library
 		--c-include-directory $root/${stage2_insert}runtime
 		--c-include-directory $root/${stage2_insert}boehm_gc
 		--c-include-directory $root/${stage2_insert}boehm_gc/include"

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------