[m-rev.] for review: clean up environment variable handling

Simon Taylor stayl at cs.mu.OZ.AU
Fri Apr 11 00:38:35 AEST 2003


Estimated hours taken: 0.5
Branches: main

Clean up the handling of environment variables.

scripts/Mmake.rules:
scripts/c2init.in:
scripts/mgnuc.in:
scripts/ml.in:
scripts/mmc.in:
scripts/parse_ml_options.sh-subr.in:
scripts/binary_step.in:
	Remove support for the environment variables which were
	previously used to override the location of the standard
	library (MERCURY_ALL_C_INCL_DIRS, MERCURY_ALL_MC_C_INCL_DIRS,
	MERCURY_INT_DIR, MERCURY_C_LIB_DIR, MERCURY_MOD_LIB_MODS,
	MERCURY_TRACE_LIB_MODS).

scripts/Mercury.config.in:
	Fix syntax errors.

scripts/mmc.in:
	Setting DEFAULT_MCFLAGS is no longer required -- mmc
	now reads its configuration information from the
	Mercury.config file. This also fixes a bug which
	caused failures in the `mmc --make' tests in
	debugging grades on mundroo -- `mmc --make' wasn't
	including /usr/local/lib and /usr/local/include in
	the search paths for libraries and headers.

NEWS:
doc/user_guide.texi:
	Document the change.


Index: doc/user_guide.texi
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/user_guide.texi,v
retrieving revision 1.362
diff -u -u -r1.362 user_guide.texi
--- doc/user_guide.texi	31 Mar 2003 09:27:27 -0000	1.362
+++ doc/user_guide.texi	1 Apr 2003 07:36:09 -0000
@@ -6806,9 +6806,6 @@
 @item MERCURY_STDLIB_DIR
 @vindex MERCURY_STDLIB_DIR
 The directory containing the installed Mercury standard library.
-If the MERCURY_ALL_C_INCL_DIRS, MERCURY_ALL_MC_C_INCL_DIRS,
-MERCURY_INT_DIR, MERCURY_MOD_LIB_MODS and MERCURY_TRACE_LIB_MODS
-variables are set the value of MERCURY_STDLIB_DIR will be ignored.
 @samp{--mercury-stdlib-dir} options passed to the @samp{mmc}, @samp{ml},
 @samp{mgnuc} and @samp{c2init} scripts override the setting of
 the MERCURY_STDLIB_DIR environment variable.
@@ -7027,61 +7024,6 @@
 Name of a file that contains startup commands for the Mercury debugger.
 This file should contain documentation for the debugger command set,
 and possibly a set of default aliases.
-
- at end table
-
-The following environment variables are deprecated, and may
-be ignored by future releases.
-
- at table @code
-
- at sp 1
- at item MERCURY_ALL_C_INCL_DIRS
- at vindex MERCURY_ALL_C_INCL_DIRS
-A list of options for the C compiler that specifies
-all the directories the C compiler should search for the C header files
-of the Mercury runtime system and garbage collector.
-The default value of this variable is @samp{-I$MERCURY_STDLIB_DIR/inc},
-since usually all these header files are installed in one directory.
-This environment variable is used by @samp{mgnuc};
-it should generally be kept in sync with
- at code{MERCURY_ALL_MC_C_INCL_DIRS}, which is used by @samp{mmc}.
-
- at sp 1
- at item MERCURY_ALL_MC_C_INCL_DIRS
- at vindex MERCURY_ALL_MC_C_INCL_DIRS
-A list of options for mmc that specifies
-all the directories it should search for the C header files
-of the Mercury runtime system and garbage collector.
-The default value of this variable is
- at samp{--c-include-directory $MERCURY_STDLIB_DIR/inc},
-since usually all these header files are installed in one directory.
-This environment variable is used by @samp{mmc};
-it should generally be kept in sync with
- at code{MERCURY_ALL_C_INCL_DIRS}, which is used by @samp{mgnuc}.
-
- at sp 1
- at item MERCURY_INT_DIR
- at vindex MERCURY_INT_DIR
-Directory for the Mercury library interface
-files (@file{*.int}, @file{*.int2}, @file{*.int3} and @file{*.opt}).
-
- at sp 1
- at item MERCURY_C_LIB_DIR
- at vindex MERCURY_C_LIB_DIR
-Base directory containing the Mercury libraries (@file{libmer_*.a} and
-possibly @file{libmer_*.so}) for each configuration and grade.
-The libraries for each configuration and grade should
-be in the subdirectory @var{config}/@var{grade} of @code{$MERCURY_C_LIB_DIR}.
-
- at item MERCURY_MOD_LIB_MODS
- at vindex MERCURY_MOD_LIB_MODS
-The names of the .init files in the Mercury library.
-
- at item MERCURY_TRACE_LIB_MODS
- at vindex MERCURY_TRACE_LIB_MODS
-The names of the .init files in the Mercury library which should
-only be used when tracing is enabled.
 
 @end table
 
Index: scripts/Mercury.config.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mercury.config.in,v
retrieving revision 1.1
diff -u -u -r1.1 Mercury.config.in
--- scripts/Mercury.config.in	1 Mar 2003 06:35:17 -0000	1.1
+++ scripts/Mercury.config.in	4 Apr 2003 04:15:59 -0000
@@ -24,62 +24,63 @@
 # be used by the substitution for SHARED_LIBS.
 MATH_LIB=$(MERCURY_MATH_LIB)
 
+DEFAULT_MERCURY_LINKAGE=@DEFAULT_LINKAGE@
+
 # The default optimization level should be after
 # all the options that describe the machine configuration.
 DEFAULT_MCFLAGS=\
-		$(MERCURY_ALL_MC_C_INCL_DIRS) \
 		@ALL_LOCAL_C_INCL_DIR_MMC_OPTS@ \
 		@ALL_LOCAL_C_LIB_DIR_MMC_OPTS@ \
 		--cc "$(MERCURY_C_COMPILER)" \
 		--grade "$(MERCURY_DEFAULT_GRADE)" \
-		--cflags-for-ansi \"@CFLAGS_FOR_ANSI@\" \
-		--cflags-for-optimization \"@CFLAGS_FOR_OPT@\" \
-		--cflags-for-warnings \"@CFLAGS_FOR_WARNINGS@\" \
-		--cflags-for-threads \"@CFLAGS_FOR_THREADS@\" \
-		--cflags-for-debug \"@CFLAGS_FOR_DEBUG@\" \
-		--cflags-for-regs \"@CFLAGS_FOR_REGS@\" \
-		--cflags-for-gotos \"@CFLAGS_FOR_GOTOS@\" \
-		--cflags-for-pic \"@CFLAGS_FOR_PIC@\" \
-		--c-flag-to-name-object-file \"@OBJFILE_OPT@\" \
-		--object-file-extension \". at OBJ_SUFFIX@\" \
-		--pic-object-file-extension \". at EXT_FOR_PIC_OBJECTS@\" \
-		--link-with-pic-object-file-extension \". at EXT_FOR_LINK_WITH_PIC_OBJECTS@\" \
-		--executable-file-extension \"@EXT_FOR_EXE@\" \
-		--shared-library-extension \". at EXT_FOR_SHARED_LIB@\" \
-		--library-extension \". at LIB_SUFFIX@\" \
-		--create-archive-command \"@AR@\" \
-		--create-archive-command-output-flag \"@AR_LIBFILE_OPT@\" \
-		--create-archive-command-flags \"@ARFLAGS@\" \
-		--ranlib-command \"@RANLIB@\" \
-		--link-executable-command \"@LINK_EXE@\" \
-		--link-shared-lib-command \"@LINK_SHARED_OBJ@\" \
-		--trace-libs \"@TRACE_LIBS_SYSTEM@\" \
-		--thread-libs \"@THREAD_LIBS@\" \
-		--shared-libs \"@SHARED_LIBS@\" \
-		--math-lib \"@MATH_LIB@\" \
-		--readline-libs \"@READLINE_LIBRARIES@\" \
-		--linker-thread-flags \"@LDFLAGS_FOR_THREADS@\" \
-		--shlib-linker-thread-flags \"@LD_LIBFLAGS_FOR_THREADS@\" \
+		--cflags-for-ansi "@CFLAGS_FOR_ANSI@" \
+		--cflags-for-optimization "@CFLAGS_FOR_OPT@" \
+		--cflags-for-warnings "@CFLAGS_FOR_WARNINGS@" \
+		--cflags-for-threads "@CFLAGS_FOR_THREADS@" \
+		--cflags-for-debug "@CFLAGS_FOR_DEBUG@" \
+		--cflags-for-regs "@CFLAGS_FOR_REGS@" \
+		--cflags-for-gotos "@CFLAGS_FOR_GOTOS@" \
+		--cflags-for-pic "@CFLAGS_FOR_PIC@" \
+		--c-flag-to-name-object-file "@OBJFILE_OPT@" \
+		--object-file-extension ". at OBJ_SUFFIX@" \
+		--pic-object-file-extension ". at EXT_FOR_PIC_OBJECTS@" \
+		--link-with-pic-object-file-extension ". at EXT_FOR_LINK_WITH_PIC_OBJECTS@" \
+		--executable-file-extension "@EXT_FOR_EXE@" \
+		--shared-library-extension ". at EXT_FOR_SHARED_LIB@" \
+		--library-extension ". at LIB_SUFFIX@" \
+		--create-archive-command "@AR@" \
+		--create-archive-command-output-flag "@AR_LIBFILE_OPT@" \
+		--create-archive-command-flags "@ARFLAGS@" \
+		--ranlib-command "@RANLIB@" \
+		--link-executable-command "@LINK_EXE@" \
+		--link-shared-lib-command "@LINK_SHARED_OBJ@" \
+		--trace-libs "@TRACE_LIBS_SYSTEM@" \
+		--thread-libs "@THREAD_LIBS@" \
+		--shared-libs "@SHARED_LIBS@" \
+		--math-lib "@MATH_LIB@" \
+		--readline-libs "@READLINE_LIBRARIES@" \
+		--linker-thread-flags "@LDFLAGS_FOR_THREADS@" \
+		--shlib-linker-thread-flags "@LD_LIBFLAGS_FOR_THREADS@" \
 		--linker-trace-flags "@LDFLAGS_FOR_TRACE@" \
 		--shlib-linker-trace-flags "@LD_LIBFLAGS_FOR_TRACE@" \
-		--linker-static-flags \"@LD_STATIC_FLAGS@\" \
-		--linker-strip-flag \"@LD_STRIP_FLAG@\" \
-		--linker-debug-flags \"@LDFLAGS_FOR_DEBUG@\" \
-		--shlib-linker-debug-flags \"@LD_LIBFLAGS_FOR_DEBUG@\" \
-		--linker-rpath-flag \"@EXE_RPATH_OPT@\" \
-		--linker-rpath-separator \"@EXE_RPATH_SEP@\" \
-		--shlib-linker-rpath-flag \"@SHLIB_RPATH_OPT@\" \
-		--shlib-linker-rpath-separator \"@SHLIB_RPATH_SEP@\" \
-		--linker-allow-undefined-flag \"@ALLOW_UNDEFINED@\" \
-		--linker-error-undefined-flag \"@ERROR_UNDEFINED@\" \
-		--fullarch \"@FULLARCH@\" \
-		--install-prefix \"@prefix@\" \
-		--num-real-r-regs \"@NUM_REAL_R_REGS@\" \
-		--num-real-r-temps \"@NUM_REAL_R_TEMPS@\" \
-		--conf-low-tag-bits \"@LOW_TAG_BITS@\" \
-		--bits-per-word \"@BITS_PER_WORD@\" \
-		--bytes-per-word \"@BYTES_PER_WORD@\" \
-		--dotnet-library-version \"@MS_DOTNET_LIBRARY_VERSION@\" \
+		--linker-static-flags "@LD_STATIC_FLAGS@" \
+		--linker-strip-flag "@LD_STRIP_FLAG@" \
+		--linker-debug-flags "@LDFLAGS_FOR_DEBUG@" \
+		--shlib-linker-debug-flags "@LD_LIBFLAGS_FOR_DEBUG@" \
+		--linker-rpath-flag "@EXE_RPATH_OPT@" \
+		--linker-rpath-separator "@EXE_RPATH_SEP@" \
+		--shlib-linker-rpath-flag "@SHLIB_RPATH_OPT@" \
+		--shlib-linker-rpath-separator "@SHLIB_RPATH_SEP@" \
+		--linker-allow-undefined-flag "@ALLOW_UNDEFINED@" \
+		--linker-error-undefined-flag "@ERROR_UNDEFINED@" \
+		--fullarch "@FULLARCH@" \
+		--install-prefix "@prefix@" \
+		--num-real-r-regs "@NUM_REAL_R_REGS@" \
+		--num-real-r-temps "@NUM_REAL_R_TEMPS@" \
+		--conf-low-tag-bits "@LOW_TAG_BITS@" \
+		--bits-per-word "@BITS_PER_WORD@" \
+		--bytes-per-word "@BYTES_PER_WORD@" \
+		--dotnet-library-version "@MS_DOTNET_LIBRARY_VERSION@" \
 		@HAVE_DELAY_SLOT@ \
 		@HAVE_BOXED_FLOATS@ \
 		@MCFLAGS_FOR_CC@ \
Index: scripts/Mmake.rules
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.143
diff -u -u -r1.143 Mmake.rules
--- scripts/Mmake.rules	27 Mar 2003 05:32:09 -0000	1.143
+++ scripts/Mmake.rules	1 Apr 2003 07:36:18 -0000
@@ -47,15 +47,11 @@
 #
 # Find the directory containing the interface files for the standard library.
 #
-ifdef MERCURY_INT_DIR
-    MERC_INT_DIR = $(MERCURY_INT_DIR)
+ifdef MERCURY_STDLIB_DIR
+    export MERCURY_STDLIB_DIR
+    MERC_INT_DIR = $(MERCURY_STDLIB_DIR)/ints
 else
-    ifdef MERCURY_STDLIB_DIR
-        export MERCURY_STDLIB_DIR
-        MERC_INT_DIR = $(MERCURY_STDLIB_DIR)/ints
-    else
-        MERC_INT_DIR =
-    endif
+    MERC_INT_DIR =
 endif
 
 #-----------------------------------------------------------------------------#
Index: scripts/c2init.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/c2init.in,v
retrieving revision 1.38
diff -u -u -r1.38 c2init.in
--- scripts/c2init.in	5 Feb 2003 14:41:20 -0000	1.38
+++ scripts/c2init.in	28 Feb 2003 01:01:43 -0000
@@ -51,11 +51,9 @@
 
 if [ "$mercury_stdlib_dir" != "" ]
 then
-	MERCURY_MOD_LIB_MODS=${MERCURY_MOD_LIB_MODS="\
-			$mercury_stdlib_dir/modules/$RT_LIB_NAME.init \
-			$mercury_stdlib_dir/modules/$STD_LIB_NAME.init"}
-	MERCURY_TRACE_LIB_MODS=${MERCURY_TRACE_LIB_MODS="\
-			$mercury_stdlib_dir/modules/$BROWSER_LIB_NAME.init"}
+	MERCURY_MOD_LIB_MODS="$mercury_stdlib_dir/modules/$RT_LIB_NAME.init \
+			$mercury_stdlib_dir/modules/$STD_LIB_NAME.init"
+	MERCURY_TRACE_LIB_MODS="$mercury_stdlib_dir/modules/$BROWSER_LIB_NAME.init"
 fi
 MERCURY_TRACE_LIB_MODS="$MERCURY_TRACE_LIB_MODS $trace_init_files"
 
Index: scripts/mgnuc.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mgnuc.in,v
retrieving revision 1.96
diff -u -u -r1.96 mgnuc.in
--- scripts/mgnuc.in	24 Jan 2003 07:17:12 -0000	1.96
+++ scripts/mgnuc.in	28 Feb 2003 01:03:16 -0000
@@ -136,7 +136,7 @@
 	but this can be changed using the \`--no-ansi' or \`--no-check'
 	options.
 Environment variables:
-	MERCURY_ALL_C_INCL_DIRS, MERCURY_DEFAULT_GRADE.
+	MERCURY_DEFAULT_GRADE.
 "
 
 while : ; do
@@ -242,13 +242,13 @@
 @CANONICAL_GRADE@
 
 case "$mercury_stdlib_dir" in
-    "")	MERC_ALL_C_INCL_DIRS=$MERCURY_ALL_C_INCL_DIRS
+    "")	MERC_ALL_C_INCL_DIRS=
     	;;
     *) 
 	# The option setting code above guarantees that if
 	# `--mercury-stdlib-dir' is set, `--mercury-config-dir'
 	# is also set.
-    	MERC_ALL_C_INCL_DIRS=${MERCURY_ALL_C_INCL_DIRS="-I$mercury_config_dir/conf -I$mercury_stdlib_dir/inc -I$mercury_stdlib_dir/lib/$GRADE/$FULLARCH/inc"}
+    	MERC_ALL_C_INCL_DIRS="-I$mercury_config_dir/conf -I$mercury_stdlib_dir/inc -I$mercury_stdlib_dir/lib/$GRADE/$FULLARCH/inc"}
 	;;
 esac
 
Index: scripts/ml.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/ml.in,v
retrieving revision 1.104
diff -u -u -r1.104 ml.in
--- scripts/ml.in	5 Feb 2003 14:41:20 -0000	1.104
+++ scripts/ml.in	28 Feb 2003 01:02:19 -0000
@@ -12,7 +12,7 @@
 #
 # Usage: see below.
 #
-# Environment variables: MERCURY_C_LIB_DIR, MERCURY_DEFAULT_GRADE, ...
+# Environment variables: MERCURY_DEFAULT_GRADE, ...
 #
 # *************************************************************************
 # *** IMPORTANT NOTE: any changes to this file may also require similar ***
@@ -106,8 +106,8 @@
 esac
 
 case "$mercury_stdlib_dir" in
-    "")	LIBDIR=$MERCURY_C_LIB_DIR ;;
-    *)	LIBDIR=${MERCURY_C_LIB_DIR=$mercury_stdlib_dir/lib} ;;
+    "")	LIBDIR= ;;
+    *)	LIBDIR=$mercury_stdlib_dir/lib ;;
 esac
 
 # If you haven't set mercury_libs, set it to the default value
Index: scripts/mmc.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mmc.in,v
retrieving revision 1.33
diff -u -u -r1.33 mmc.in
--- scripts/mmc.in	1 Mar 2003 06:35:17 -0000	1.33
+++ scripts/mmc.in	1 Apr 2003 07:57:10 -0000
@@ -15,109 +15,11 @@
 # MERCURY_C_COMPILER, MERCURY_DEFAULT_GRADE, MERCURY_DEFAULT_OPT_LEVEL.
 
 MC=${MERCURY_COMPILER="@LIBDIR@/bin/@FULLARCH@/mercury_compile"}
-case "$MERCURY_INT_DIR" in
-    "")
-	INT_DIR_OPT=
-	CONFIG_DIR=${MERCURY_STDLIB_DIR- at LIBDIR@}
-	MERCURY_CONFIG_DIR=${MERCURY_CONFIG_DIR=$CONFIG_DIR}
-	MERCURY_STDLIB_DIR=${MERCURY_STDLIB_DIR=@LIBDIR@}
-	export MERCURY_CONFIG_DIR MERCURY_STDLIB_DIR
-	STDLIB_DIR_OPT="--mercury-standard-library-directory \"${MERCURY_STDLIB_DIR}\""
-	if [ "$MERCURY_STDLIB_DIR" != "$MERCURY_CONFIG_DIR" ]; then
-		CONFIG_DIR_OPT="--mercury-configuration-directory \"${CONFIG_DIR}\""
-	else
-		CONFIG_DIR_OPT=
-	fi
-	;;
-    *)
-	INT_DIR_OPT="-I $MERCURY_INT_DIR"
-	STDLIB_DIR_OPT=--no-mercury-standard-library-directory
-	CONFIG_DIR_OPT=--no-mercury-configuration-directory
-	unset MERCURY_STDLIB_DIR MERCURY_CONFIG_DIR
-	CONFIG_DIR_OPT=
-	;;
-esac
-
-MATH_LIB=${MERCURY_MATH_LIB="@MATH_LIB@"}
-SHARED_LIBS="@SHARED_LIBS_SH@"
-
-DEFAULT_MERCURY_LINKAGE=${MERCURY_LINKAGE=@DEFAULT_LINKAGE@}
-export DEFAULT_MERCURY_LINKAGE
-
-# The default options settings are passed in the DEFAULT_MCFLAGS enviroment
-# variable, rather than on the command line, so that they can be overridden
-# by the value of MCFLAGS in the Mercury.options file. 
-#
-# The default optimization level should be after
-# all the options that describe the machine configuration.
-#
-# XXX Add --linker-trace-flags "@LDFLAGS_FOR_TRACE@" and
-#	--shlib-linker-trace-flags "@LD_LIBFLAGS_FOR_TRACE@"
-#	once those options are accepted everywhere.
-DEFAULT_MCFLAGS=${DEFAULT_MCFLAGS-"\
-		@ALL_LOCAL_C_INCL_DIR_MMC_OPTS@ \
-		@ALL_LOCAL_C_LIB_DIR_MMC_OPTS@ \
-		$MERCURY_ALL_MC_C_INCL_DIRS \
-		--cc \"${MERCURY_C_COMPILER=@CC@}\" \
-		--grade \"${MERCURY_DEFAULT_GRADE=@DEFAULT_GRADE@}\" \
-		--cflags-for-ansi \"@CFLAGS_FOR_ANSI@\" \
-		--cflags-for-optimization \"@CFLAGS_FOR_OPT@\" \
-		--cflags-for-warnings \"@CFLAGS_FOR_WARNINGS@\" \
-		--cflags-for-threads \"@CFLAGS_FOR_THREADS@\" \
-		--cflags-for-debug \"@CFLAGS_FOR_DEBUG@\" \
-		--cflags-for-regs \"@CFLAGS_FOR_REGS@\" \
-		--cflags-for-gotos \"@CFLAGS_FOR_GOTOS@\" \
-		--cflags-for-pic \"@CFLAGS_FOR_PIC@\" \
-		--c-flag-to-name-object-file \"@OBJFILE_OPT@\" \
-		--object-file-extension \". at OBJ_SUFFIX@\" \
-		--pic-object-file-extension \". at EXT_FOR_PIC_OBJECTS@\" \
-		--link-with-pic-object-file-extension \". at EXT_FOR_LINK_WITH_PIC_OBJECTS@\" \
-		--executable-file-extension \"@EXT_FOR_EXE@\" \
-		--shared-library-extension \". at EXT_FOR_SHARED_LIB@\" \
-		--library-extension \". at LIB_SUFFIX@\"
-		--create-archive-command \"@AR@\" \
-		--create-archive-command-output-flag \"@AR_LIBFILE_OPT@\" \
-		--create-archive-command-flags \"@ARFLAGS@\" \
-		--ranlib-command \"@RANLIB@\" \
-		--link-executable-command \"@LINK_EXE@\" \
-		--link-shared-lib-command \"@LINK_SHARED_OBJ@\" \
-		--trace-libs \"@TRACE_LIBS_SYSTEM@\" \
-		--thread-libs \"@THREAD_LIBS@\" \
-		--shared-libs \"$SHARED_LIBS\" \
-		--math-lib \"$MATH_LIB\" \
-		--readline-libs \"@READLINE_LIBRARIES@\" \
-		--linker-thread-flags \"@LDFLAGS_FOR_THREADS@\" \
-		--shlib-linker-thread-flags \"@LD_LIBFLAGS_FOR_THREADS@\" \
-		--linker-static-flags \"@LD_STATIC_FLAGS@\" \
-		--linker-strip-flag \"@LD_STRIP_FLAG@\" \
-		--linker-debug-flags \"@LDFLAGS_FOR_DEBUG@\" \
-		--shlib-linker-debug-flags \"@LD_LIBFLAGS_FOR_DEBUG@\" \
-		--linker-rpath-flag \"@EXE_RPATH_OPT@\" \
-		--linker-rpath-separator \"@EXE_RPATH_SEP@\" \
-		--shlib-linker-rpath-flag \"@SHLIB_RPATH_OPT@\" \
-		--shlib-linker-rpath-separator \"@SHLIB_RPATH_SEP@\" \
-		--linker-allow-undefined-flag \"@ALLOW_UNDEFINED@\" \
-		--linker-error-undefined-flag \"@ERROR_UNDEFINED@\" \
-		--fullarch \"@FULLARCH@\" \
-		--install-prefix \"@prefix@\" \
-		@LIBGRADE_OPTS@ \
-		--num-real-r-regs \"@NUM_REAL_R_REGS@\" \
-		--num-real-r-temps \"@NUM_REAL_R_TEMPS@\" \
-		--conf-low-tag-bits \"@LOW_TAG_BITS@\" \
-		--bits-per-word \"@BITS_PER_WORD@\" \
-		--bytes-per-word \"@BYTES_PER_WORD@\" \
-		--dotnet-library-version \"@MS_DOTNET_LIBRARY_VERSION@\" \
-		@HAVE_DELAY_SLOT@ \
-		@HAVE_BOXED_FLOATS@ \
-		@MCFLAGS_FOR_CC@ \
-		${MERCURY_DEFAULT_OPT_LEVEL=-O2} \
-		$STDLIB_DIR_OPT \
-		$CONFIG_DIR_OPT \
-		"}
-export DEFAULT_MCFLAGS
+MERCURY_CONFIG_DIR=${MERCURY_CONFIG_DIR-${MERCURY_STDLIB_DIR- at LIBDIR@}}
+export MERCURY_CONFIG_DIR
 
 case $# in
-	0) exec $MC $INT_DIR_OPT ;;
-	*) exec $MC "$@" $INT_DIR_OPT ;;
+	0) exec $MC ;;
+	*) exec $MC "$@" ;;
 esac
 
Index: scripts/parse_ml_options.sh-subr.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/parse_ml_options.sh-subr.in,v
retrieving revision 1.6
diff -u -u -r1.6 parse_ml_options.sh-subr.in
--- scripts/parse_ml_options.sh-subr.in	24 Jan 2003 07:17:13 -0000	1.6
+++ scripts/parse_ml_options.sh-subr.in	28 Feb 2003 01:00:32 -0000
@@ -205,9 +205,7 @@
 
 Environment variables:
 		MERCURY_DEFAULT_GRADE, MERCURY_C_COMPILER,
-		MERCURY_C_LIB_DIR, MERCURY_NONSHARED_LIB_DIR,
-		MERCURY_MOD_LIB_MODS, MERCURY_TRACE_LIB_MODS,
-		MERCURY_MKINIT."
+		MERCURY_NONSHARED_LIB_DIR, MERCURY_MKINIT."
 
 # The following options are not generally useful, so they are not documented:
 # -i, --include-initialization-code
Index: tools/binary_step
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/binary_step,v
retrieving revision 1.18
diff -u -u -r1.18 binary_step
--- tools/binary_step	22 Jun 2002 19:16:13 -0000	1.18
+++ tools/binary_step	1 Mar 2003 10:08:01 -0000
@@ -147,8 +147,6 @@
 
 MERCURY_COMPILER=$root/compiler/mercury_compile
 export MERCURY_COMPILER
-MERCURY_INT_DIR=$root/stage2/library
-export MERCURY_INT_DIR
 
 MMAKE_VPATH=.
 export MMAKE_VPATH
@@ -226,8 +224,6 @@
 
 MERCURY_COMPILER=$root/stage2/compiler/mercury_compile
 export MERCURY_COMPILER
-MERCURY_INT_DIR=$root/stage3/library
-export MERCURY_INT_DIR
 
 ulimit -t 200
 
@@ -336,11 +332,6 @@
 			echo "stage2.$basis and stage3 compare ok"
 		fi
 	fi
-else
-	# since we have not created any stage3, we can't let MERCURY_INT_DIR
-	# to continue to refer to stage3/library
-	MERCURY_INT_DIR=$root/stage2/library
-	export MERCURY_INT_DIR
 fi
 
 for testdir in $testdirs
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list