[m-rev.] for review: fix mundroo readline linking problem

Simon Taylor stayl at cs.mu.OZ.AU
Tue Nov 19 01:34:28 AEDT 2002


Estimated hours taken: 1
Branches: main, release

scripts/ml.in:
	Search /usr/local/lib for shared libraries. This fixes
	problems linking debugging executables on mundroo.

	Document why we don't default to static linking for
	all libraries on Solaris/x86.

Index: ml.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/ml.in,v
retrieving revision 1.101
diff -u -u -r1.101 ml.in
--- ml.in	2002/10/30 16:35:37	1.101
+++ ml.in	2002/11/18 14:25:26
@@ -127,7 +127,12 @@
 	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
+		# 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
 			;;
@@ -379,12 +384,17 @@
 		;;
 esac
 
+case $all_libs in
+	shared) system_shlib_dirs="/usr/local/lib" ;;
+	static)	system_shlib_dirs="" ;;
+esac
 
 RPATH_OPT_LIST=
 # only set RPATH_OPT_LIST if the system supports shared libraries
 case $EXT_FOR_SHARED_LIB in so)
 	prev=""
-	for dir in $user_shlib_dirs $merc_shlib_dirs 'kludge for broken shells'
+	for dir in $user_shlib_dirs $merc_shlib_dirs \
+			$system_shlib_dirs 'kludge for broken shells'
 	do
 	    case "$dir" in
 		'kludge for broken shells')
--------------------------------------------------------------------------
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