[m-rev.] diff: make static linking the default on x86_64

[Julien Fischer]

Estimated hours taken: 0.1
Branches: main

Make static libraries the default on x86_64 systems.  With this
change we can now enable nightly builds on saturn.

NOTE: shared libraries work in the hlc*, reg* and none* grades but
not yet in the asm_fast* grades - I'm still looking into this.

scripts/ml.in:
	Make static libraries the default on x86_64 Linux systems.

Julien.

Index: ml.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/ml.in,v
retrieving revision 1.113
diff -u -r1.113 ml.in
--- ml.in	23 Dec 2004 04:19:35 -0000	1.113
+++ ml.in	20 Sep 2005 03:57:55 -0000
@@ -116,13 +116,23 @@
 # it will also have set mercury_libs.
 case $mercury_libs in default)
 	mercury_libs=shared
-	case $FULLARCH in i*86-*-linux*|i*86-*-freebsd*|i*86-*-cygwin*|i*86-*-solaris*)
-		# shared libraries are not the default on x86 systems that
-		# use ELF -- see README.Linux
-		case $make_shared_lib in false)
-			mercury_libs=static
-			;;
-		esac
+	case $FULLARCH in
+		i*86-*-linux*|i*86-*-freebsd*|i*86-*-cygwin*|i*86-*-solaris*)
+			# shared libraries are not the default on x86
+			#systems that use ELF -- see README.Linux
+			case $make_shared_lib in false)
+				mercury_libs=static
+				;;
+			esac
+		;;
+		x86_64-*-linux*)
+			# Shared libraries are also not the default on x86_64
+			# (XXX at least for the moment - eventually they should
+			# be.)
+			case $make_shared_lib in false)
+				mercury_libs=static
+				;;
+			esac
 		;;
 	esac
 	;;
@@ -132,19 +142,26 @@
 # (shared on most systems).
 case $all_libs in default)
 	all_libs=shared
-	case $FULLARCH in i*86-*-linux*|i*86-*-freebsd*|i*86-*-cygwin*)
-		# shared libraries are not the default on Linux
-		# -- see README.Linux
-		# Likewise for FreeBSD and Cygwin
-		#
-		# We don't do this for Solaris/x86 because -ldl is
-		# only available for dynamically linked executables
-		# XXX With these defaults linking with Mercury libraries
-		# other than the standard library will fail.
-		case $make_shared_lib in false)
-			all_libs=static
+	case $FULLARCH in
+		i*86-*-linux*|i*86-*-freebsd*|i*86-*-cygwin*)
+			# shared libraries are not the default on Linux
+			# -- see README.Linux
+			# Likewise for FreeBSD and Cygwin
+			#
+			# We don't do this for Solaris/x86 because -ldl is
+			# only available for dynamically linked executables
+			# XXX With these defaults linking with Mercury
+			# libraries other than the standard library will fail.
+			case $make_shared_lib in false)
+				all_libs=static
+				;;
+			esac
 			;;
-		esac
+		x86_64-*-linux*)
+			case $make_shared_lib in false)
+				all_libs=static
+				;;
+			esac
 		;;
 	esac
 	;;
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------