[m-rev.] diff: fixes for mercury on x86/solaris

[Julien Fischer]

Estimated hours taken: 0.5
Branches: main, release

scripts/Mercury.config.in:
 	Back out my recent change since it breaks mmc --make on Solaris.

configure.in:
 	Don't try to statically link the configure test on Solaris 2.9.

Julien.

Index: configure.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/configure.in,v
retrieving revision 1.467
diff -u -r1.467 configure.in
--- configure.in	17 Aug 2006 01:51:16 -0000	1.467
+++ configure.in	18 Aug 2006 06:47:22 -0000
@@ -189,7 +189,7 @@
  #-----------------------------------------------------------------------------#

  case "$host" in 
-	i386-pc-solaris2.8)	link_static_opt= ;;
+	i*86-*-solaris2.*)	link_static_opt= ;;
  	*solaris2.10)		link_static_opt= ;;
  	*powerpc*apple*darwin*) link_static_opt= ;;
  	*)			link_static_opt="--linkage static" ;;
Index: scripts/Mercury.config.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/scripts/Mercury.config.in,v
retrieving revision 1.14
diff -u -r1.14 Mercury.config.in
--- scripts/Mercury.config.in	10 Aug 2006 07:43:40 -0000	1.14
+++ scripts/Mercury.config.in	18 Aug 2006 05:54:50 -0000
@@ -115,7 +115,5 @@
  		@MCFLAGS_FOR_CC@ \
  		$(MERCURY_DEFAULT_OPT_LEVEL) \
  		@MMC_USE_SYMLINKS_OPT@ \
-		@LIBGRADE_OPTS@  \
-		--linkage @DEFAULT_LINKAGE@ \
-		--mercury-linkage @DEFAULT_LINKAGE@
+		@LIBGRADE_OPTS@


--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------