Skip to content

Commit 1919983

Browse files
Issue #1099: Fix the build on MacOSX when building a framework with pydebug using GCC 4.0.
1 parent b44e184 commit 1919983

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Makefile.pre.in

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -457,17 +457,11 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
457457
$(LIBRARY) \
458458
$(RESSRCDIR)/Info.plist
459459
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
460-
if test "${UNIVERSALSDK}"; then \
461-
$(CC) -o $(LDLIBRARY) @UNIVERSAL_ARCH_FLAGS@ -dynamiclib \
462-
-isysroot "${UNIVERSALSDK}" \
463-
-all_load $(LIBRARY) -Wl,-single_module \
464-
-install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
465-
-compatibility_version $(VERSION) \
466-
-current_version $(VERSION); \
467-
else \
468-
/usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
469-
@LIBTOOL_CRUFT@ ;\
470-
fi
460+
$(CC) -o $(LDLIBRARY) $(LDFLAGS) -dynamiclib \
461+
-all_load $(LIBRARY) -Wl,-single_module \
462+
-install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
463+
-compatibility_version $(VERSION) \
464+
-current_version $(VERSION);
471465
$(INSTALL) -d -m $(DIRMODE) \
472466
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
473467
$(INSTALL_DATA) $(RESSRCDIR)/Info.plist \

Misc/NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,9 @@ Build
251251
support now looks for "__powerpc__" as well as "__ppc__": the latter seems to
252252
only be present on OS X; the former is the correct one for Linux with GCC.
253253

254+
- Issue #1099: Fix the build on MacOSX when building a framework with pydebug
255+
using GCC 4.0.
256+
254257
Tests
255258
-----
256259

@@ -795,6 +798,7 @@ Extension Modules
795798

796799
- Issue #7567: Don't call `setupterm' twice.
797800

801+
798802
Tools/Demos
799803
-----------
800804

0 commit comments

Comments
 (0)