From 19199830f7f880b1e9cff5d92d30706fd8bb4700 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Mon, 14 Mar 2011 11:57:39 -0400 Subject: [PATCH] Issue #1099: Fix the build on MacOSX when building a framework with pydebug using GCC 4.0. --- Makefile.pre.in | 16 +++++----------- Misc/NEWS | 4 ++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 2b28cae902f..41745f5864a 100644 --- 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 2cfafccda32..16ab29573d3 100644 --- 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 -----------