* ltcf-c.sh (wlarc, netbsd, aout): Set wlarc to empty.

(hardcode_dynamic_flag_spec, export_dynamic_flag_spec): Use
wlarc instead of wl.
* ltcf-gcj.sh (wlarc, netbsd, aout): Set wlarc to empty.
(hardcode_dynamic_flag_spec, export_dynamic_flag_spec): Use
wlarc instead of wl.

diff --git a/ChangeLog b/ChangeLog
index 5c8408b1909bcb213d4ce759270b5288f29731f7..dc3c317e8f84fc4904a9fa29c0e24ba1a5143419 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2000-07-10  Alexandre Oliva  <aoliva@lsd.ic.unicamp.br>
 
+       * ltcf-c.sh (wlarc, netbsd, aout): Set wlarc to empty.
+       (hardcode_dynamic_flag_spec, export_dynamic_flag_spec): Use
+       wlarc instead of wl.
+       * ltcf-gcj.sh (wlarc, netbsd, aout): Set wlarc to empty.
+       (hardcode_dynamic_flag_spec, export_dynamic_flag_spec): Use
+       wlarc instead of wl.
+
        * ltconfig.in (dynamic_linker, linux, powerpc): Do not disable
        shared libraries just because of MkLinux.
 

diff --git a/ltcf-c.sh b/ltcf-c.sh
index 098cb00f51e4c4f1ad172312f4d752999b5cb72c..3277e9415e87ae800908500b9df67a5dc644ac85 100644 (file)
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -172,6 +172,7 @@ EOF
   netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       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'
@@ -218,8 +219,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.

diff --git a/ltcf-gcj.sh b/ltcf-gcj.sh
index f4e06fcc21ca85841a07cf708bd8be8be0e9b629..44b1fb234cf49f9b641da1edc8ae4ed78d8209a6 100644 (file)
--- a/ltcf-gcj.sh
+++ b/ltcf-gcj.sh
@@ -175,6 +175,7 @@ EOF
   netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       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'
@@ -221,8 +222,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.