From 5f4a098e0594c3d49af7ce0c06dc60d6e3d395a8 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Wed, 8 Sep 2004 15:43:46 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ ltmain.sh | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/ChangeLog b/ChangeLog index 99d11dd2b23..e37666374a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-09-08 David Edelsohn + + * ltmain.sh: Use $pic_object as $non_pic_object if + $non_pic_object=none. + 2004-09-07 Paolo Bonzini * missing: Import latest version from master repository. 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. -- 2.30.2