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

This commit is contained in:
Ronald Oussoren 2011-03-14 11:57:39 -04:00
parent b44e1841d5
commit 19199830f7
2 changed files with 9 additions and 11 deletions

View File

@ -457,17 +457,11 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
$(LIBRARY) \ $(LIBRARY) \
$(RESSRCDIR)/Info.plist $(RESSRCDIR)/Info.plist
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION) $(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
if test "${UNIVERSALSDK}"; then \ $(CC) -o $(LDLIBRARY) $(LDFLAGS) -dynamiclib \
$(CC) -o $(LDLIBRARY) @UNIVERSAL_ARCH_FLAGS@ -dynamiclib \ -all_load $(LIBRARY) -Wl,-single_module \
-isysroot "${UNIVERSALSDK}" \ -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
-all_load $(LIBRARY) -Wl,-single_module \ -compatibility_version $(VERSION) \
-install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \ -current_version $(VERSION);
-compatibility_version $(VERSION) \
-current_version $(VERSION); \
else \
/usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
@LIBTOOL_CRUFT@ ;\
fi
$(INSTALL) -d -m $(DIRMODE) \ $(INSTALL) -d -m $(DIRMODE) \
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
$(INSTALL_DATA) $(RESSRCDIR)/Info.plist \ $(INSTALL_DATA) $(RESSRCDIR)/Info.plist \

View File

@ -251,6 +251,9 @@ Build
support now looks for "__powerpc__" as well as "__ppc__": the latter seems to 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. 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 Tests
----- -----
@ -795,6 +798,7 @@ Extension Modules
- Issue #7567: Don't call `setupterm' twice. - Issue #7567: Don't call `setupterm' twice.
Tools/Demos Tools/Demos
----------- -----------