diff options
| author | Matthias Klose <doko@ubuntu.com> | 2009-02-24 11:07:44 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2009-02-24 11:07:44 +0000 |
| commit | 54fba82310bd8441dfc580e37daacb52a217d4fb (patch) | |
| tree | e421bf60f62015655ef41a76a23758fb8ea37e20 | |
| parent | d187d520850833c46944f0096362270f6f09b8ab (diff) | |
| download | cpython-git-54fba82310bd8441dfc580e37daacb52a217d4fb.tar.gz | |
- Link the shared python library with $(MODLIBS).
| -rw-r--r-- | Makefile.pre.in | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 37dd77fe87..5c5e29c37b 100644 --- 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 @@ -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 ========================== |