From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Mon, 14 Mar 2011 14:11:59 +0000 (-0400)
Subject: Fixes #1099: Mac compile fails with pydebug and framework enabled
X-Git-Tag: v3.2.1b1~310^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=250324952e63a51fe885d457d207082f249bbefd;p=thirdparty%2FPython%2Fcpython.git

Fixes #1099: Mac compile fails with pydebug and framework enabled

Without this patch "./configure --with-pydebug --enable-framework CC=gcc-4.0" fails on MacOSX
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index fc3116a76043..c2fc69a7928d 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -459,18 +459,12 @@ $(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) \
-			-framework CoreFoundation $(LIBS); \
-        else \
-		/usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
-			@LIBTOOL_CRUFT@ -framework CoreFoundation $(LIBS);\
-	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) \
+		-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
index 2b099783dbaf..9eb0537dd521 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -218,6 +218,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
 -----