* ltconfig.in: For sunos4 using GNU ld, set hardcode_minus_L to

	no.
	* ltmain.in: Add some hacks to make SunOS --enable-shared work
	when using GNU ld.

diff --git a/ChangeLog b/ChangeLog
index de660eaac65a0776f4c72d0e91b6a3a225b6ced0..55bb293bc368fbcd0d999b78d3f1aa9a70d7990a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-11-04  Ian Lance Taylor  <ian@cygnus.com>
+
+       * ltconfig.in: For sunos4 using GNU ld, set hardcode_minus_L to
+       no.
+       * ltmain.in: Add some hacks to make SunOS --enable-shared work
+       when using GNU ld.
+
 1998-11-04  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * THANKS: Added Marc J. Fraioli

diff --git a/ltconfig.in b/ltconfig.in
index e98946bc646a90d2f8332a22465d256dc11e4504..96f8091c8aad15028c1ecebe87cfbd4353e99a3f 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -806,7 +806,10 @@ if test "$with_gnu_ld" = yes; then
   sunos4*)
     archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
     hardcode_direct=yes
-    hardcode_minus_L=yes
+    # The GNU linker will only hardcode -L options if -rpath is not
+    # used, but we will be using -rpath because we set
+    # hardcode_libdir_flag_spec below.
+    hardcode_minus_L=no
     hardcode_shlibpath_var=no
     ;;
 

diff --git a/ltmain.in b/ltmain.in
index f5f9de4961dcbfa56cd62312d5e28f4ae7a9ab58..3965769c9260d1bbeae9217797d076d7cf833837 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -885,6 +885,11 @@ compiler."
             if test "$hardcode_direct" = no; then
               compile_command="$compile_command $dir/$linklib"
             elif test "$hardcode_minus_L" = no; then
+             case "$host" in
+             *-*-sunos*)
+                compile_shlibpath="$compile_shlibpath$dir:"
+               ;;
+             esac
               compile_command="$compile_command -L$dir -l$name"
             elif test "$hardcode_shlibpath_var" = no; then
               compile_shlibpath="$compile_shlibpath$dir:"
@@ -1193,8 +1198,8 @@ compiler."
          major=
          versuffix=
          verstring="0.0"
-         case "$version_type" in
-         sunos)
+         case "$host" in
+         *-*-sunos*)
            versuffix=".0.0"
            ;;
          esac