From f4ff34a3047cd5dafebeeb733559c5dc0dba2339 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Thu, 20 Feb 2003 01:12:28 +0000 Subject: * libtool.m4 (LD): Append -melf* option to LD on IRIX with GNU ld. * ltconfig: Handle it. * ltcf-cxx.sh: Use with_gnu_ld passed as a shell variable instead of auto-detecting it. --- ltconfig | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'ltconfig') diff --git a/ltconfig b/ltconfig index 5ccefe0..5be6089 100755 --- a/ltconfig +++ b/ltconfig @@ -1186,6 +1186,11 @@ hpux9* | hpux10* | hpux11*) ;; irix5* | irix6*) + if test "$with_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + if version_type=irix need_lib_prefix=no need_version=no @@ -1197,9 +1202,12 @@ irix5* | irix6*) ;; *) case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; *) libsuff= shlibsuff= libmagic=never-match;; esac ;; -- cgit v1.1