[m-rev.] diff: finish bootstrapping --dotnet-library-version

[Peter Ross]

Hi,


===================================================================


Estimated hours taken: 0.25
Branches: main

Finish bootstrapping the --dotnet-library-version change.
This has been tagged with bootstrap_20020311_dotnet_library_version.

configure.in:
	Check that we accept --dotnet-library-version on the mmc
	command line.

scripts/mmc.in:
	Pass the autoconfed --dotnet-library-version to
	mercury_compile.

Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.299
diff -u -r1.299 configure.in
--- configure.in	18 Feb 2002 07:00:42 -0000	1.299
+++ configure.in	11 Mar 2002 13:17:17 -0000
@@ -119,12 +119,12 @@
 		").
 EOF
 	if
-		# Test for the `--no-warn-inferred-erroneous' option.
-	 	echo $BOOTSTRAP_MC conftest >&AC_FD_CC 2>&1 &&
-	 	$BOOTSTRAP_MC \
-            --no-warn-inferred-erroneous \
+		# Test for the `--dotnet-library-version' option.
+		echo $BOOTSTRAP_MC conftest >&AC_FD_CC 2>&1 &&
+		$BOOTSTRAP_MC \
+			--dotnet-library-version 1.0.3300.0 \
 			--halt-at-warn $link_flags conftest \
-		 	</dev/null >&AC_FD_CC 2>&1 &&
+			</dev/null >&AC_FD_CC 2>&1 &&
 		test "`./conftest 2>&1 | tr -d '\015'`" = "Hello, world"
 	then
 		AC_MSG_RESULT(yes)
@@ -1755,10 +1755,10 @@
 AC_MSG_CHECKING(if C compiler is egcs)
 case "`$CC --version < /dev/null 2>&1`" in
     egcs-*)
-    	mercury_cv_egcs=yes
+	mercury_cv_egcs=yes
 	;;
     *)
-    	mercury_cv_egcs=no
+	mercury_cv_egcs=no
 	;;
 esac
 AC_MSG_RESULT($mercury_cv_egcs)
Index: scripts/mmc.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mmc.in,v
retrieving revision 1.19
diff -u -r1.19 mmc.in
--- scripts/mmc.in	3 Mar 2002 12:12:54 -0000	1.19
+++ scripts/mmc.in	11 Mar 2002 13:17:18 -0000
@@ -58,6 +58,7 @@
 		--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 \
 		$DEFAULT_OPT_LEVEL \
@@ -77,6 +78,7 @@
 		--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 \
 		$DEFAULT_OPT_LEVEL \
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------