[Python-checkins] cpython (merge default -> default): Merge with default.
reid.kleckner
python-checkins at python.org
Mon Mar 14 17:16:12 CET 2011
http://hg.python.org/cpython/rev/2a2f0b01eaf7
changeset: 68456:2a2f0b01eaf7
parent: 68455:d3d3ef2f6b6a
parent: 68453:f12c3706debf
user: Reid Kleckner <reid at kleckner.net>
date: Mon Mar 14 12:15:42 2011 -0400
summary:
Merge with default.
files:
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -486,18 +486,12 @@
$(LIBRARY) \
$(RESSRCDIR)/Info.plist
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
- if test "${UNIVERSALSDK}"; then \
- $(CC) -o $(LDLIBRARY) @UNIVERSAL_ARCH_FLAGS@ -dynamiclib \
- -isysroot "${UNIVERSALSDK}" \
- -all_load $(LIBRARY) -Wl,-single_module \
- -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
- -compatibility_version $(VERSION) \
- -current_version $(VERSION) \
- -framework CoreFoundation $(LIBS); \
- else \
- /usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
- @LIBTOOL_CRUFT@ -framework CoreFoundation $(LIBS);\
- fi
+ $(CC) -o $(LDLIBRARY) $(PY_LDFLAGS) -dynamiclib \
+ -all_load $(LIBRARY) -Wl,-single_module \
+ -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
+ -compatibility_version $(VERSION) \
+ -current_version $(VERSION) \
+ -framework CoreFoundation $(LIBS);
$(INSTALL) -d -m $(DIRMODE) \
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
$(INSTALL_DATA) $(RESSRCDIR)/Info.plist \
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -621,6 +621,9 @@
support now looks for "__powerpc__" as well as "__ppc__": the latter seems to
only be present on OS X; the former is the correct one for Linux with GCC.
+- Issue #1099: Fix the build on MacOSX when building a framework with pydebug
+ using GCC 4.0.
+
Tools/Demos
-----------
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list