From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Sun, 17 Jan 1999 09:18:54 +0000 (+0000)
Subject: 	* ltconfig.in (wlarc): set to either '${wl}' or an empty string,
X-Git-Tag: automake_1-4~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f6e865761541d1a239e23e7d42c36f64679eed5;p=thirdparty%2Flibtool.git

	* ltconfig.in (wlarc): set to either '${wl}' or an empty string,
 	depending on whether archive_cmds runs CC or LD
	(gnu_ld=yes, whole_archive_flag_spec): "$wlarc" instead of '${wl}'
---

diff --git a/ChangeLog b/ChangeLog
index 0ce9c1861..a7258dc4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-01-17  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* ltconfig.in (wlarc): set to either '${wl}' or an empty string,
+ 	depending on whether archive_cmds runs CC or LD
+	(gnu_ld=yes, whole_archive_flag_spec): "$wlarc" instead of '${wl}'
+
 	* mdemo/Makefile.am (../libltdl/libltdlc.la): depend on
 	../libtool, because ../libltdl/libtool depends on it
 	(mdemo_debug_*): copy from mdemo_*, adding -static to LDFLAGS
diff --git a/ltconfig.in b/ltconfig.in
index f9160ec8a..3f5ab9250 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1019,6 +1019,8 @@ esac
 
 ld_shlibs=yes
 if test "$with_gnu_ld" = yes; then
+  # If archive_cmds runs LD, not CC, wlarc should be empty
+  wlarc='${wl}'
 
   # See if GNU ld supports shared libraries.
   case "$host_os" in
@@ -1030,6 +1032,7 @@ if test "$with_gnu_ld" = yes; then
 
   sunos4*)
     archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs'
+    wlarc=
     hardcode_direct=yes
     hardcode_minus_L=yes
     hardcode_shlibpath_var=no
@@ -1104,11 +1107,11 @@ if test "$with_gnu_ld" = yes; then
     ;;
   esac
 
-  if test "$ld_shlibs" = yes && test "$with_gnu_ld" = yes; then
+  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'
-    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+    whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
   fi
 else
   # PORTME fill in a description of your system's linker (not GNU ld)