aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edelsohn <edelsohn@gnu.org>2004-09-08 15:43:46 +0000
committerDavid Edelsohn <dje@gcc.gnu.org>2004-09-08 11:43:46 -0400
commit5f4a098e0594c3d49af7ce0c06dc60d6e3d395a8 (patch)
tree201e2ac31d3189bb61da1c626d80ff77fa5a9f3d
parent599eabdb42d10c1404f13d21137c85946d7fbd92 (diff)
downloadgcc-5f4a098e0594c3d49af7ce0c06dc60d6e3d395a8.zip
gcc-5f4a098e0594c3d49af7ce0c06dc60d6e3d395a8.tar.gz
gcc-5f4a098e0594c3d49af7ce0c06dc60d6e3d395a8.tar.bz2
ltmain.sh: Use $pic_object as $non_pic_object if $non_pic_object=none.
* ltmain.sh: Use $pic_object as $non_pic_object if $non_pic_object=none. From-SVN: r87191
-rw-r--r--ChangeLog5
-rw-r--r--ltmain.sh10
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 99d11dd..e376663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-08 David Edelsohn <edelsohn@gnu.org>
+
+ * ltmain.sh: Use $pic_object as $non_pic_object if
+ $non_pic_object=none.
+
2004-09-07 Paolo Bonzini <bonzini@gnu.org>
* missing: Import latest version from master repository.
diff --git a/ltmain.sh b/ltmain.sh
index c1ef997..90925cb 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.