* ltconfig.in (netbsd*): archive_cmds and archive_expsym_cmds

were reversed with respect to definition of __ELF__.
From Keisuke Inoue <keisuke@csl.sony.co.jp>
* ltconfig.in (wlarc, netbsd, aout): Set to empty.
(hardcode_dynamic_flag_spec, export_dynamic_flag_spec): Use it.

diff --git a/ChangeLog b/ChangeLog
index 29a90b9a35355194272c2b1431e64ec316c98342..1ec8155fa858a0ec8d5a29d214949fc24c7a3ac7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-10  Alexandre Oliva  <aoliva@lsd.ic.unicamp.br>
+
+       * ltconfig.in (netbsd*): archive_cmds and archive_expsym_cmds
+       were reversed with respect to definition of __ELF__.
+       From Keisuke Inoue <keisuke@csl.sony.co.jp>
+       * ltconfig.in (wlarc, netbsd, aout): Set to empty.
+       (hardcode_dynamic_flag_spec, export_dynamic_flag_spec): Use it.
+
 2000-07-10  Corinna Vinschen  <vinschen@cygnus.com>
 
        * ltconfig.in: Check for host_os beeing one of `cygwin', `mingw'

diff --git a/ltconfig.in b/ltconfig.in
index 9ecea198d44e2351fbdc15996e60f858bb4ac8ec..9172e9944deb889e723d226e7f3cb37711d6858c 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # ltconfig - Create a system-specific libtool.
-# Copyright (C) 1996-1999 Free Software Foundation, Inc.
+# Copyright (C) 1996-2000 Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This file is free software; you can redistribute it and/or modify it
@@ -1201,11 +1201,11 @@ EOF
 
   netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+      wlarc=
+    else
       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-      # can we support soname and/or expsyms with a.out? -oliva
     fi
     ;;
 
@@ -1249,8 +1249,8 @@ EOF
 
   if test "$ld_shlibs" = yes; then
     runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
+    hardcode_libdir_flag_spec="$wlarc"'--rpath '"$wlarc"'$libdir'
+    export_dynamic_flag_spec="$wlarc"'--export-dynamic'
     case $host_os in
     cygwin* | mingw*)
       # dlltool doesn't understand --whole-archive et. al.