Merged revisions 69889 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69889 | matthias.klose | 2009-02-23 00:14:26 +0100 (Mo, 23 Feb 2009) | 2 lines
- Link the shared python library with $(MODLIBS).
........
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 0c33171..8f3384b 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -419,10 +419,10 @@
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
- $(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+ $(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
$(LN) -f $(INSTSONAME) $@; \
else \
- $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+ $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
fi
libpython$(VERSION).dylib: $(LIBRARY_OBJS)
@@ -430,7 +430,7 @@
libpython$(VERSION).sl: $(LIBRARY_OBJS)
- $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
+ $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
# This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
# minimal framework (not including the Lib directory and such) in the current
diff --git a/Misc/NEWS b/Misc/NEWS
index ea659a5..09af442 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -479,6 +479,8 @@
Build
-----
+- Link the shared python library with $(MODLIBS).
+
- Issue #5134: Silence compiler warnings when compiling sqlite with VC++.
- Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows.