* ltmain.in (link mode): Use $pic_object as $non_pic_object if

$non_pic_object=none.
* NEWS: Updated.
Missing backport from HEAD 2004-09-03 noted
by Max Bowsher <maxb1@ukf.net>.

diff --git a/ChangeLog b/ChangeLog
index 4595a95e5c4489f5b7b338beb9d7f1df7b0afa34..ce74acc02aa674943da377ba53bd0763ca2cbda4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-24  David Edelsohn  <dje@watson.ibm.com>
+
+       * ltmain.in (link mode): Use $pic_object as $non_pic_object if
+       $non_pic_object=none.
+       * NEWS: Updated.
+       Missing backport from HEAD 2004-09-03 noted
+       by Max Bowsher <maxb1@ukf.net>.
+
 2005-11-20  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * ltmain.in (link mode): Pass through `-pg', for GCC.

diff --git a/NEWS b/NEWS
index 551d7bce1c8931660be14ae2c7ea367a7cfc940d..188f360fb333d0c5a1c7d68f18393be907fc3fae 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ New in 1.5.21a: 2005-??-??; CVS version 1.5.21a, Libtool team:
   link statically against installed libtool libraries, contrary to
   documented (and actual 1.4.x) behavior.
 * Support for Interix 3 (Windows SFU).
+* If non-pic objects were not compiled, and libtool is called in link mode,
+  libtool no longer silently creates an empty archive, but rather falls
+  back to pic objects.
 * Bug Fixes.
 \f
 New in 1.5.20: 2005-08-31; CVS version 1.5.19a, Libtool team:

diff --git a/ltmain.in b/ltmain.in
index 29c60a9ee672b579102d3615fb9def0f3d1c08ad..119e83f92b4d20f9f48e976d75b644286f76fdc7 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1271,6 +1271,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.
@@ -1799,6 +1804,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.