Fix linking from only convenience archives with gfortran on Darwin.

* libltdl/m4/libtool.m4 (_LT_DARWIN_LINKER_FEATURES): Update
macro comment header.
[darwin, F77, FC] <compiler_needs_object>: Set to yes if
whole_archive_flag_spec is nonempty.  Fixes convenience.at test
suite failures with gfortran 4.2 on Darwin.
* THANKS: Update.
Report by Paul Laight.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index bee99a60c2c28b81d5cdd6155f5b8a55b0e06876..fbd8386c8fc525afa693d6b31a5e8894fbe09c7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2010-10-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix linking from only convenience archives with gfortran on Darwin.
+       * libltdl/m4/libtool.m4 (_LT_DARWIN_LINKER_FEATURES): Update
+       macro comment header.
+       [darwin, F77, FC] <compiler_needs_object>: Set to yes if
+       whole_archive_flag_spec is nonempty.  Fixes convenience.at test
+       suite failures with gfortran 4.2 on Darwin.
+       * THANKS: Update.
+       Report by Paul Laight.
+
        Fix bindir check logic, and relax non-bindir case for AIX.
        * tests/bindir.at (bindir install tests): Rewrite checks for
        place of the installed shared library in two separate tests,

diff --git a/THANKS b/THANKS
index 5aa0c3c14ad298c809e6e440df2995ac4e8f21aa..c1e9968f92bddfaa68b990f8cea326ddd1fb435d 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -145,6 +145,7 @@
   Patrick Welche               prlw1@newn.cam.ac.uk
   Paul Biggar                  paul.biggar@gmail.com
   Paul Eggert                  eggert@twinsun.com
+  Paul Laight                  plaight@quantxautomation.co.uk
   Peter Eisentraut             peter_e@gmx.net
   Peter Fritzsche              peter.fritzsche@gmx.de
   Peter Jeremy                 peterjeremy@optushome.com.au

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 967dd3884ff9b2539f18f2af956b9c406fd6ade8..d8b3a4d4df885f8b6d5312332bf5285cc79b9805 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1035,8 +1035,8 @@ _LT_EOF
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1047,6 +1047,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi