From: Peter O'Gorman <peter@pogma.com>
Date: Fri, 11 Jun 2010 03:00:47 +0000 (-0500)
Subject: Create reloadable object files with non-pic objects too.
X-Git-Tag: v2.4~162
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5e292a4eeb886859fdb41f9eb417a097ac6fff7;p=thirdparty%2Flibtool.git

Create reloadable object files with non-pic objects too.

* libltdl/config/ltmain.m4sh: When not building a shared
library, use the non-pic objects to create a reloadable
object, because pic objects do not exist.
---

diff --git a/ChangeLog b/ChangeLog
index c94b0c771..92ef0ce16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-10  Peter O'Gorman  <peter@pogma.com>
+
+	Create reloadable object files with non-pic objects too.
+	* libltdl/config/ltmain.m4sh: When not building a shared
+	library, use the non-pic objects to create a reloadable
+	object, because pic objects do not exist.
+
 2010-06-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Ensure libltdl is up to date for check-local.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 9e6646fad..5906552a9 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -7180,6 +7180,9 @@ EOF
 	fi
       fi
 
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
       # Create the old-style object.
       reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test