diff options
| author | Reid Kleckner <reid@kleckner.net> | 2011-03-14 16:15:42 (GMT) |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2011-03-14 16:15:42 (GMT) |
| commit | 3eb2347c8ce29ac76de4c2e4f98c6ecfa3b69e01 (patch) | |
| tree | 13649ecbb8f74a06269c9008ad3ccf43fb43613f | |
| parent | 84857017144469bf91bcec451c7835894432dd41 (diff) | |
| parent | a05a5033429dace7472a6108d5e74125be5447dd (diff) | |
| download | cpython-3eb2347c8ce29ac76de4c2e4f98c6ecfa3b69e01.zip cpython-3eb2347c8ce29ac76de4c2e4f98c6ecfa3b69e01.tar.gz cpython-3eb2347c8ce29ac76de4c2e4f98c6ecfa3b69e01.tar.bz2 | |
Merge with default.
| -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 8d7f5ad..c3004ce 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -486,18 +486,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) $(PY_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 \ @@ -621,6 +621,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. + Tools/Demos ----------- |