From: Nick Hudson <skrll@netbsd.org>
Date: Fri, 20 Apr 2001 20:55:18 +0000 (+0000)
Subject: * libtool.m4: Improve NetBSD support.
X-Git-Tag: release-1-4~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f67d1c368be4217a2b313f3092545f8c824049f9;p=thirdparty%2Flibtool.git

* libtool.m4: Improve NetBSD support.
* ltmain.in: ditto.
---

diff --git a/ChangeLog b/ChangeLog
index 1771e5a8c..48b419bfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-20  Nick Hudson  <skrll@netbsd.org>
+
+	* libtool.m4: Improve NetBSD support.
+	* ltmain.in: ditto.
+	
 2001-04-19  Dan McNichol <mcnichol@austin.ibm.com>
 
 	* libtool.m4: Build standard shared libraries on AIX POWER
diff --git a/libtool.m4 b/libtool.m4
index 0750785af..00ea1c6fb 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -1320,8 +1320,8 @@ EOF
       archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
       wlarc=
     else
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
     fi
     ;;
 
@@ -2045,6 +2045,8 @@ linux-gnu*)
 
 netbsd*)
   version_type=sunos
+  need_lib_prefix=no
+  need_version=no
   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
     library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
diff --git a/ltmain.in b/ltmain.in
index 61feba21c..e363ed954 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -1032,6 +1032,9 @@ compiler."
 	    deplibs="$deplibs -framework System"
 	    continue
 	    ;;
+          *-*-netbsd*)
+            # Don't link with libc until the a.out ld.so is fixed.
+            ;;
 	  esac
 	elif test "$arg" = "-lm"; then
 	  case $host in