diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2011-03-14 15:57:39 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2011-03-14 15:57:39 (GMT) |
| commit | 19199830f7f880b1e9cff5d92d30706fd8bb4700 (patch) | |
| tree | 681e18a23663fab730dd8866e7185f8a07020889 | |
| parent | b44e1841d504269f01250949fc97e98ccd0ba8a2 (diff) | |
| download | cpython-19199830f7f880b1e9cff5d92d30706fd8bb4700.zip cpython-19199830f7f880b1e9cff5d92d30706fd8bb4700.tar.gz cpython-19199830f7f880b1e9cff5d92d30706fd8bb4700.tar.bz2 | |
Issue #1099: Fix the build on MacOSX when building a framework with pydebug using GCC 4.0.
| -rw-r--r-- | Makefile.pre.in | 16 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 2b28cae..41745f5 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 \ @@ -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 ----------- |