From: Gary V. Vaughan <gary@gnu.org>
Date: Wed, 20 Dec 2000 22:57:53 +0000 (+0000)
Subject: * ltmain.in (dlprefiles): Now that `2000-12-15 Utz-Uwe Haus' patch
X-Git-Tag: multi-language-merge-point~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cc7bf946d5b76f944781120fb4eea8a540646d8;p=thirdparty%2Flibtool.git

* ltmain.in (dlprefiles): Now that `2000-12-15 Utz-Uwe Haus' patch
below can detect preopened library deplibs correctly in libltdl,
we need to ensure that libtool library deplibs are also preloaded
into the binary for that phase to work.
---

diff --git a/ChangeLog b/ChangeLog
index d59a4a8df..44d6cdb69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-20  Gary V. Vaughan  <gvv@techie.com>
+
+	* ltmain.in (dlprefiles): Now that `2000-12-15 Utz-Uwe Haus' patch
+	below can detect preopened library deplibs correctly in libltdl,
+	we need to ensure that libtool library deplibs are also preloaded
+	into the binary for that phase to work.
+
 2000-12-16  Aneesh Kumar K.V  <kvaneesh@hotmail.com>
 
 	* ltcf-c.sh (OSF/1): Change  the way to pass linker flags through
diff --git a/ltmain.in b/ltmain.in
index 0ba71b610..a2cd9b216 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -1777,9 +1777,11 @@ EOF
 	    exit 1
 	  fi
 	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking statically,
-	    # we need to preload.
-	    dlprefiles="$dlprefiles $lib"
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    dlprefiles="$dlprefiles $lib $dependency_libs"
 	  else
 	    newdlfiles="$newdlfiles $lib"
 	  fi