]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Fixes #1099: Mac compile fails with pydebug and framework enabled
authorRonald Oussoren <ronaldoussoren@mac.com>
Mon, 14 Mar 2011 14:11:59 +0000 (10:11 -0400)
committerRonald Oussoren <ronaldoussoren@mac.com>
Mon, 14 Mar 2011 14:11:59 +0000 (10:11 -0400)
Without this patch "./configure --with-pydebug --enable-framework CC=gcc-4.0" fails on MacOSX

Makefile.pre.in
Misc/NEWS

index fc3116a760430df0935033f5b497ca6422d21344..c2fc69a7928d8fa47d297f791791917e94836542 100644 (file)
@@ -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 \
index 2b099783dbaf0ab8d0e5ffe9d890efa9ba3e0814..9eb0537dd52132bb8640dcf991a28efa0a3be397 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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
 -----