X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ltmain.sh;h=eee5763387b3d353de096ab878b1a7a53f2a92e0;hb=5ed0e368c68e29254e12e74ae1223f683e23582b;hp=8f8f6fb9081bb500a8bd3e136ea3155d5f64257f;hpb=99e9c6f741ee7022432ffa600c6c7e5612063ab5;p=deliverable%2Fbinutils-gdb.git

diff --git a/ltmain.sh b/ltmain.sh
index 8f8f6fb908..eee5763387 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -743,6 +743,11 @@ if test -z "$show_help"; then
             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:"
@@ -1055,6 +1060,11 @@ if test -z "$show_help"; then
 	  major=
 	  versuffix=
 	  verstring="0.0"
+	  case "$host" in
+	  *-*-sunos*)
+	    versuffix=".0.0"
+	    ;;
+	  esac
 	fi
 
 	# Check to see if the archive will have undefined symbols.
@@ -1657,6 +1667,7 @@ fi\
 	addlibs="$convenience"
 	build_libtool_libs=no
       else
+	oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^   ]*\.a //g' -e 's/[^   ]*\.lib //g' -e "$los2o" -e 's/ $//g'`
 	addlibs="$old_convenience"
       fi
 
@@ -1751,7 +1762,7 @@ libdir='$install_libdir'\
 
     # There may be an optional sh(1) argument at the beginning of
     # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL"; then
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = "/bin/sh"; then
       # Aesthetically quote it.
       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
       case "$arg" in