Commit 25032495 authored by Ronald Oussoren's avatar Ronald Oussoren

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
parent d89ee79d
...@@ -459,18 +459,12 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ ...@@ -459,18 +459,12 @@ $(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 \
-isysroot "${UNIVERSALSDK}" \
-all_load $(LIBRARY) -Wl,-single_module \ -all_load $(LIBRARY) -Wl,-single_module \
-install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \ -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
-compatibility_version $(VERSION) \ -compatibility_version $(VERSION) \
-current_version $(VERSION) \ -current_version $(VERSION) \
-framework CoreFoundation $(LIBS); \ -framework CoreFoundation $(LIBS);
else \
/usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
@LIBTOOL_CRUFT@ -framework CoreFoundation $(LIBS);\
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 \
......
...@@ -218,6 +218,9 @@ Build ...@@ -218,6 +218,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
----- -----
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment