* ltmain.sh: Use $pic_object as $non_pic_object if

        $non_pic_object=none.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@87191 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 10 insertions, 0 deletions

diff --git a/ltmain.sh b/ltmain.sh
index c1ef9974d0e..90925cb2f6d 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1041,6 +1041,11 @@ EOF
                   if test -z "$pic_object" || test "$pic_object" = none ; then
                     arg="$non_pic_object"
                   fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  non_pic_objects="$non_pic_objects $non_pic_object"
                 fi
               else
                 # Only an error if not doing a dry-run.
@@ -1466,6 +1471,11 @@ EOF
             if test -z "$pic_object" || test "$pic_object" = none ; then
               arg="$non_pic_object"
             fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    non_pic_objects="$non_pic_objects $non_pic_object"
           fi
         else
           # Only an error if not doing a dry-run.