From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 29 Nov 2004 21:12:41 +0000 (+0000)
Subject: * m4/libtool.m4 (_LT_LINKER_SHLIBS): Treat linux-dietlibc with
X-Git-Tag: release-2-1b~832
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5874b17a08df8343e4ebdac1f31cd00dd892d48;p=thirdparty%2Flibtool.git

* 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 7f753a8f4..86ef4d6f3 100644
--- 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 66444cefd..74eae87b8 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ New in 2.1b: 2005-??-??; CVS version 2.1a, Libtool team:
 * New tests for support of Automake subdir-objects.
 * Support for Portland Group compiler on Linux.
 * Fix libltdl on static platforms.
+* Support for linux-dietlibc (`diet' as well as `diet-dyn', separately).
 
 New in 1.9h: 2004-??-??; CVS version 1.9g, Libtool team:
 * Libtool versions can now be parallel installed, except that only one
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 65a7177b6..6dddab8dd 100644
--- 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"