From 875f85450489ef79fc664e333513a8186f202339 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Fri, 3 Sep 2004 13:02:33 +0000 Subject: [PATCH] * config/ltmain.in (func_mode_link): Use $pic_object as $non_pic_object if $non_pic_object=none. * NEWS: Updated. --- ChangeLog | 6 ++++++ NEWS | 9 ++++++--- config/ltmain.in | 10 ++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 906f3761..791fdacb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-09-03 David Edelsohn + + * config/ltmain.in (func_mode_link): Use $pic_object as + $non_pic_object if $non_pic_object=none. + * NEWS: Updated. + 2004-09-03 Gary V. Vaughan * bootstrap: Remember that the ltmain.sh generated by bootstrap diff --git a/NEWS b/NEWS index e6ce1a88..f92ff5d4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,12 @@ NEWS - list of user-visible changes between releases of GNU Libtool New in 1.9d: 2004-??-??; CVS version 1.9c, Libtool team: +* 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. +* libtool uses automake's $(mkdir_p), and can support `make -j' on + multi-processor hosts if automake discovered a multithreadable mkdir. If + it still doesn't work for you, install GNU mkdir (in GNU coreutils). * Return type, and name parameter of lt_dlloader_remove are no longer `const'. * Name parameter of lt_dlloader_find is no longer 'const'. @@ -10,9 +16,6 @@ New in 1.9d: 2004-??-??; CVS version 1.9c, Libtool team: types have been exchanged. See libltdl/slist.c for documentation. * libltdl is C89 compatible again. lt_dlsymbol type removed, and lt_dlsymlist structure changed to avoid using C99 flexible arrays. -* libtool uses automake's $(mkdir_p), and can support `make -j' on - multi-processor hosts if automake discovered a multithreadable mkdir. If - it still doesn't work for you, install GNU mkdir (in GNU coreutils). * Fixed some memory leaks in libltdl. New in 1.9b: 2004-08-29; CVS version 1.5a, Libtool team: diff --git a/config/ltmain.in b/config/ltmain.in index 58810f9b..e22f0d2b 100644 --- a/config/ltmain.in +++ b/config/ltmain.in @@ -2555,6 +2555,11 @@ func_mode_link () 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. @@ -3063,6 +3068,11 @@ func_mode_link () 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.