Issue #1099: Fix the build on MacOSX when building a framework with pydebug using...

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 2b28cae902f70800dea5cad2ae22f357b88221ca..41745f5864a18904e3f7a4c72ca703abe8032462 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -457,17 +457,11 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
                $(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); \
-        else \
-               /usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
-                       @LIBTOOL_CRUFT@ ;\
-       fi
+       $(CC) -o $(LDLIBRARY) $(LDFLAGS)  -dynamiclib \
+               -all_load $(LIBRARY) -Wl,-single_module \
+               -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
+               -compatibility_version $(VERSION) \
+               -current_version $(VERSION);
        $(INSTALL) -d -m $(DIRMODE)  \
                $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
        $(INSTALL_DATA) $(RESSRCDIR)/Info.plist \

diff --git a/Misc/NEWS b/Misc/NEWS
index 2cfafccda32bba0b4c513aba0fd9ad74e61f4bff..16ab29573d3f28f0780595518917ebed7158ae32 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -251,6 +251,9 @@ Build
   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.
+
 Tests
 -----
 
@@ -795,6 +798,7 @@ Extension Modules
 
 - Issue #7567: Don't call `setupterm' twice.
 
+
 Tools/Demos
 -----------