- Link the shared python library with $(MODLIBS).

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 37dd77fe87f6fcd59887925c6a33f944fe3591ae..5c5e29c37b6d1fc2b050c38633fe8aefcfe58235 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -412,10 +412,10 @@ $(LIBRARY): $(LIBRARY_OBJS)
 
 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)
@@ -423,7 +423,7 @@ libpython$(VERSION).dylib: $(LIBRARY_OBJS)
                 
 
 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 97688f26e502cce9e7e399a62f979cccb614e29f..c71c6786cd318a8a13b16df4b5e84078b467ef22 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -201,6 +201,11 @@ Extension Modules
 
 - Issue #1040026: Fix os.times result on systems where HZ is incorrect.
 
+Build
+-----
+
+- Link the shared python library with $(MODLIBS).
+
 
 What's New in Python 2.6.1
 ==========================