* m4/libtool.m4 (_LT_LINKER_SHLIBS): Treat linux-dietlibc with

the `diet' compiler wrapper (as opposed to the `diet-dyn'
wrapper) as a static-only platform.
* NEWS: Updated.

diff --git a/ChangeLog b/ChangeLog
index bf2c34cdf916ff1e8afb77f0d864b2fbdeb6f427..9e60179839da422d630cf05674044fcbe897364d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-11-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * m4/libtool.m4 (_LT_LINKER_SHLIBS): Treat linux-dietlibc with
+       the `diet' compiler wrapper (as opposed to the `diet-dyn'
+       wrapper) as a static-only platform.
+       * NEWS: Updated.
+
        * libltdl/ltdl.c (trim): Use memcpy instead of strncpy here, to
        avoid problems with non-conforming strncpy.  This is safe here.
 

diff --git a/NEWS b/NEWS
index f6138b160f797c7de6ee22b3d8ab1dfa2912bab0..62de04cabfcd9eb31b4a5c7649656c31442ccb17 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 New in 1.9h: 2004-??-??; CVS version 1.9g, Libtool team:
 * Support for Portland Group compiler on Linux.
 * Fix libltdl on static platforms.
+* Support for linux-dietlibc (`diet' as well as `diet-dyn', separately).
 \f
 New in 1.9f: 2004-10-23; CVS version 1.9e, Libtool team:
 * Calculate dllsearchpath correctly for wrapper scripts on cygwin.

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 33df32adbeaa8d48b1579bb1612eef168770805c..8eb3014fb9cd84dddf5d08772fdb6afd561477f5 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -3611,8 +3611,16 @@ _LT_EOF
       ;;
 
     linux*|tpf*)
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+       case "$cc_basename" in
+         diet\ *) tmp_diet=yes;;       # linux-dietlibc with static linking (!diet-dyn)
+       esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+        && test "$tmp_diet" = no
+      then
+       tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
        # Portland Group f77 and f90 compilers require an additonal -fpic
        if test "$CC" = "pgf77" -o "$CC" = "pgf90"; then
           tmp_archive_cmds="$tmp_archive_cmds -fpic"