[m-rev.] trivial diff: fix release branch test failures

[Simon Taylor]

Estimated hours taken: 0.1

tools/test_mercury:
	Fix a bug in my last change -- `--mercury-linkage'
	doesn't work on the release branch.

Index: test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.235
diff -u -u -r1.235 test_mercury
--- test_mercury	12 Feb 2003 23:44:18 -0000	1.235
+++ test_mercury	14 Feb 2003 06:00:13 -0000
@@ -264,7 +264,14 @@
 		# On x86 Unix, we need to set the following flags to enable
 		# shared libraries (and we need to use shared libraries to
 		# avoid running out of disk space...)
-		TEST_MCFLAGS="$TEST_MCFLAGS --mercury-linkage shared"
+		case $BRANCH in
+		    latest)
+			TEST_MCFLAGS="$TEST_MCFLAGS --mercury-linkage shared"
+		    	;;
+		    *)
+			TEST_MCFLAGS="$TEST_MCFLAGS --pic-reg"
+			;;
+		esac
 		TEST_MGNUCFLAGS="$TEST_MGNUCFLAGS --pic-reg"
 		TEST_MLFLAGS="$TEST_MLFLAGS --shared"
 		;;
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------