diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2011-03-14 14:11:59 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2011-03-14 14:11:59 (GMT) |
| commit | 250324952e63a51fe885d457d207082f249bbefd (patch) | |
| tree | d0c81e5bd63c061a026953559bde289f4d4fbe42 | |
| parent | d89ee79d19e156e874b7a292b705d167b7fe56ab (diff) | |
| download | cpython-250324952e63a51fe885d457d207082f249bbefd.zip cpython-250324952e63a51fe885d457d207082f249bbefd.tar.gz cpython-250324952e63a51fe885d457d207082f249bbefd.tar.bz2 | |
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
| -rw-r--r-- | Makefile.pre.in | 18 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 9 insertions, 12 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index fc3116a..c2fc69a 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 \ @@ -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 ----- |