* ltconfig.in (solaris): do not use $CC for linking if GNU ld is

	not available

diff --git a/ChangeLog b/ChangeLog
index 4c2c19678485558ff1ec6b85dac7f2d8ff401fa0..1eaafdcb3dec0461a72a81ec8ef64722f8487609 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-04  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * ltconfig.in (solaris): do not use $CC for linking if GNU ld is
+       not available
+
 1998-12-04  Manfred Weichel  <Manfred.Weichel@pdb.siemens.de>
 
        * ltconfig.in: Port to SCO UnixWare 7.x.

diff --git a/ltconfig.in b/ltconfig.in
index bd540c4ceef1c7627550df23c14d387d29ecdb03..69b79f963f3024fab8401ff3e2e3ad61c2680876 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1278,13 +1278,11 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
 
   solaris*)
     no_undefined_flag=' -z text'
-    if test "$with_gcc" = yes; then
-      archive_cmds='$CC -shared ${wl}-h $wl$soname -o $lib$libobjs$deplibs'
-    else
-      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib$libobjs$deplibs'
-      archive_sym_cmds='$echo "{ global:" > $lib.exp~sed $export_symbols -e "s/.*/\1;/" >> $lib.exp~$echo "local: * }" > $lib.exp~
+    # $CC -shared without GNU ld will not create a library from C++
+    # object files and a static libstdc++, better avoid it by now
+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib$libobjs$deplibs'
+    archive_sym_cmds='$echo "{ global:" > $lib.exp~sed $export_symbols -e "s/.*/\1;/" >> $lib.exp~$echo "local: * }" > $lib.exp~
                $LD -G${allow_undefined_flag} -M $export_symbols -h $soname -o $lib$libobjs$deplibs~$rm $lib.exp'
-    fi
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_shlibpath_var=no