[Python-checkins] cpython (3.1): Fixes #1099: Mac compile fails with pydebug and framework enabled

[ronald.oussoren]

http://hg.python.org/cpython/rev/7af5a9298251
changeset:   68449:7af5a9298251
branch:      3.1
parent:      68443:f816841bab03
user:        Ronald Oussoren <ronaldoussoren at mac.com>
date:        Mon Mar 14 10:11:59 2011 -0400
summary:
  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

files:
  Makefile.pre.in
  Misc/NEWS

diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -459,18 +459,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) $(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
@@ -218,6 +218,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.
+
 Tests
 -----
 

-- 
Repository URL: http://hg.python.org/cpython