diff: fix scripts/c2init.in

Fergus Henderson fjh at cs.mu.OZ.AU
Sun Mar 21 15:40:00 AEDT 1999


Estimated hours taken: 0.5

scripts/c2init.in:
	Fix a bug where it was generating code that referred to
	the initialization functions for the browser library
	even when `--trace' was not specified on the command line
	and the grade was not a debugging grade.

Index: scripts/c2init.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/c2init.in,v
retrieving revision 1.21
diff -u -r1.21 c2init.in
--- c2init.in	1998/12/06 23:48:58	1.21
+++ c2init.in	1999/03/21 04:34:13
@@ -63,11 +63,6 @@
 BROWSER_LIB_NAME=mer_browser
 
 MERCURY_MOD_LIB_DIR=${MERCURY_MOD_LIB_DIR=@LIBDIR@/modules}
-MERCURY_MOD_LIB_MODS=${MERCURY_MOD_LIB_MODS="\
-				$MERCURY_MOD_LIB_DIR/$RT_LIB_NAME.init \
-				$MERCURY_MOD_LIB_DIR/$STD_LIB_NAME.init \
-				$MERCURY_MOD_LIB_DIR/$BROWSER_LIB_NAME.init \
-			"}
 MKINIT=${MERCURY_MKINIT=mkinit}
 
 # maximum number of calls to put in a single function
@@ -135,17 +130,29 @@
 
 case $require_tracing in
 	true)
-		trace_opt="-t"
+		trace_opt="-t" ;;
 esac
 
 case $stack_trace in
 	true)
-		init_opt="-i"
+		init_opt="-i" ;;
 esac
 
 case "$trace_opt" in
 	-t)
 		init_opt="-i"
+		MERCURY_MOD_LIB_MODS=${MERCURY_MOD_LIB_MODS="\
+				$MERCURY_MOD_LIB_DIR/$RT_LIB_NAME.init \
+				$MERCURY_MOD_LIB_DIR/$STD_LIB_NAME.init \
+				$MERCURY_MOD_LIB_DIR/$BROWSER_LIB_NAME.init \
+			"}
+		;;
+	*)
+		MERCURY_MOD_LIB_MODS=${MERCURY_MOD_LIB_MODS="\
+				$MERCURY_MOD_LIB_DIR/$RT_LIB_NAME.init \
+				$MERCURY_MOD_LIB_DIR/$STD_LIB_NAME.init \
+			"}
+		;;
 esac
 
 case $# in

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



More information about the developers mailing list