diff options
author | Ronald Oussoren <ronaldoussoren@mac.com> | 2011-03-14 15:34:21 (GMT) |
---|---|---|
committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2011-03-14 15:34:21 (GMT) |
commit | a9d397bb0540f64ada5fb3c12fd855266cd50f70 (patch) | |
tree | 0d88241eab8465866ae77f31e1c3399a83b1dc1a /Makefile.pre.in | |
parent | af9be2006021783c4dcdf1918ddcd8961195aa3b (diff) | |
parent | 42d0f68458beff65f1efb0281be5e310b1b02381 (diff) | |
download | cpython-a9d397bb0540f64ada5fb3c12fd855266cd50f70.zip cpython-a9d397bb0540f64ada5fb3c12fd855266cd50f70.tar.gz cpython-a9d397bb0540f64ada5fb3c12fd855266cd50f70.tar.bz2 |
Issue #1099: Fix the build on MacOSX when building a framework with pydebug
using GCC 4.0.
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r-- | Makefile.pre.in | 18 |
1 files changed, 6 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 \ |