diff options
| author | Matthias Klose <doko@ubuntu.com> | 2009-02-22 23:18:38 (GMT) |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2009-02-22 23:18:38 (GMT) |
| commit | 906785c4c20c5b2ea25fbca63c01732a6818e61c (patch) | |
| tree | b154d728ed8eec52bfeea048d21a74e8f31b849d /Makefile.pre.in | |
| parent | 929a7236906e1658c6d165fe818ebb0250223de5 (diff) | |
| download | cpython-906785c4c20c5b2ea25fbca63c01732a6818e61c.zip cpython-906785c4c20c5b2ea25fbca63c01732a6818e61c.tar.gz cpython-906785c4c20c5b2ea25fbca63c01732a6818e61c.tar.bz2 | |
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).
........
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ $(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) @@ -430,7 +430,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 |