From: Nick Hudson <skrll@netbsd.org>
Date: Fri, 20 Apr 2001 21:01:36 +0000 (+0000)
Subject: * libtool.m4: Improve NetBSD support.
X-Git-Tag: multi-language-merge-point~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f02a20b5da55473d05d10d3461d78cc12b63f75;p=thirdparty%2Flibtool.git

* libtool.m4: Improve NetBSD support.
* ltcf-c.sh: ditto.
* ltcf-gcj.sh: ditto.
* ltmain.in: ditto.
---

diff --git a/ChangeLog b/ChangeLog
index 1da26a961..600c80f12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-20  Nick Hudson  <skrll@netbsd.org>
+
+	* libtool.m4: Improve NetBSD support.
+	* ltcf-c.sh: ditto.
+	* ltcf-gcj.sh: ditto.
+	* ltmain.in: ditto.
+	
 2001-04-20  Alexandre Oliva  <aoliva@redhat.com>
 
 	* ltcf-cxx.sh [HP-UX GNU ld]: Don't use flags specific to the
diff --git a/ltcf-c.sh b/ltcf-c.sh
index 17b65111c..cef1012e8 100644
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -188,8 +188,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
     ;;
 
diff --git a/ltcf-gcj.sh b/ltcf-gcj.sh
index 2fa090c14..7f31db3e3 100644
--- a/ltcf-gcj.sh
+++ b/ltcf-gcj.sh
@@ -181,8 +181,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
     ;;
 
@@ -431,7 +431,7 @@ else
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
     else
-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      archive_cmds='$LD -shared -nodefaultlibs -o $lib $libobjs $deplibs $linker_flags'      # ELF
     fi
     hardcode_libdir_flag_spec='${wl}-R$libdir'
     hardcode_direct=yes
diff --git a/ltconfig.in b/ltconfig.in
index 4ca139f92..33d3e85c0 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1217,6 +1217,8 @@ linux-gnu*)
   ;;
 
 netbsd*)
+  need_lib_prefix=no
+  need_version=no
   version_type=sunos
   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
     library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
diff --git a/ltmain.in b/ltmain.in
index e379224eb..7eb941e4d 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -1218,6 +1218,9 @@ EOF
 	    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