[m-dev.] diff: fix problem with bootcheck and --split-c-files

[Fergus Henderson]

Estimated hours taken: 1

Fix a bug where tools/bootcheck was failing the
tests/hard_coded/split_c_files test case.

scripts/mmc.in:
	Add a new environment variable MERCURY_MC_ALL_C_INCL_DIRS
	which can be used to override MERCURY_C_INCL_DIR;
	it is similar to the MERCURY_ALL_C_INCL_DIRS used by mgnuc,
	except that it should contain `--c-include-directory' options
	rather than `-I' options.

tools/bootcheck:
	Pass down MERCURY_MC_ALL_C_INCL_DIRS,
	just like the way we pass down MERCURY_ALL_C_INCL_DIRS.

Workspace: /home/mercury0/fjh/mercury
Index: scripts/mmc.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mmc.in,v
retrieving revision 1.6
diff -u -d -r1.6 mmc.in
--- scripts/mmc.in	1998/11/05 10:51:32	1.6
+++ scripts/mmc.in	2000/03/24 20:03:04
@@ -11,11 +11,13 @@
 # Use `mmc -h' for help.
 #
 # Environment variables: MERCURY_INT_DIR, MERCURY_C_INCL_DIR,
+# MERCURY_ALL_MC_C_INCL_DIRS,
 # MERCURY_COMPILER, MERCURY_C_COMPILER,
 # MERCURY_DEFAULT_GRADE, MERCURY_DEFAULT_OPT_LEVEL.
 
 INTDIR=${MERCURY_INT_DIR=@LIBDIR@/ints}
-C_INCL=${MERCURY_C_INCL_DIR=@LIBDIR@/inc}
+MERC_C_INCL_DIR=${MERCURY_C_INCL_DIR=@LIBDIR@/inc}
+MERC_ALL_MC_C_INCL_DIRS=${MERCURY_ALL_MC_C_INCL_DIRS=--c-include-directory $MERC_C_INCL_DIR}
 MC=${MERCURY_COMPILER="@LIBDIR@/bin/@FULLARCH@/mercury_compile"}
 DEFAULT_GRADE=${MERCURY_DEFAULT_GRADE=@DEFAULT_GRADE@}
 CC=${MERCURY_C_COMPILER="@CC@"}
@@ -35,7 +37,7 @@
 
 case $# in
 	0) exec $MC \
-		--c-include-directory "$C_INCL" \
+		$MERC_ALL_MC_C_INCL_DIRS \
 		--cc "$CC" --grade "$DEFAULT_GRADE" \
 		--cflags-for-regs "$CFLAGS_FOR_REGS" \
 		--cflags-for-gotos "$CFLAGS_FOR_GOTOS" \
@@ -50,7 +52,7 @@
 		-I "$INTDIR"
 		;;
 	*) exec $MC \
-		--c-include-directory "$C_INCL" \
+		$MERC_ALL_MC_C_INCL_DIRS \
 		--cc "$CC" --grade "$DEFAULT_GRADE" \
 		--cflags-for-regs "$CFLAGS_FOR_REGS" \
 		--cflags-for-gotos "$CFLAGS_FOR_GOTOS" \
Index: tools/bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.90
diff -u -d -r1.90 bootcheck
--- tools/bootcheck	2000/01/24 00:40:19	1.90
+++ tools/bootcheck	2000/03/24 20:05:00
@@ -697,6 +697,11 @@
 		-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}runtime
+		--c-include-directory $root/${stage2_insert}boehm_gc
+		--c-include-directory $root/${stage2_insert}boehm_gc/include"
+	export MERCURY_ALL_MC_C_INCL_DIRS
 
 	MMAKE_DIR="$root/${stage2_insert}scripts"
 	export MMAKE_DIR

-- 
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
--------------------------------------------------------------------------