* libtool.m4: Improve NetBSD support.

* ltmain.in: ditto.

diff --git a/ChangeLog b/ChangeLog
index 1771e5a8c4856cca492287ef142b2f4332b3faa4..48b419bfd076cfc582c3ec802719cdf8f57f6207 100644 (file)
--- 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 0750785af87f1b73e5bf185a3462bf0c517fd47a..00ea1c6fbe9fd8399fa937d5e2116cd8fa464464 100644 (file)
--- 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 61feba21c6e958feb4157732e7588644f4d97866..e363ed9549de1a1bf5318063b25fe9f2b4034467 100644 (file)
--- 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