summaryrefslogtreecommitdiff
path: root/Mac
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-03-28 01:16:23 -0700
committerNed Deily <nad@python.org>2018-03-28 04:16:23 -0400
commit39c0ef5171e1cdcc2ed59685a81b194e9bfe3809 (patch)
treeb9e4f8766d05eaa4f114aa4128a2b28f62bc1a26 /Mac
parentd2d5bd8bc4f58b572702d572dc8491f0a50144e6 (diff)
downloadcpython-git-39c0ef5171e1cdcc2ed59685a81b194e9bfe3809.tar.gz
bpo-32726: Do not force IDLE.app to launch in 32-bit mode. (GH-6280)
Forcing the macOS IDLE.app gui process to launch in 32-mode was a necessary hack for old versions of Tk (Aqua Carbon as in Tk 8.4 and early versions of 8.5); it is not needed for current versions of Tk. Since 32-bit launching will no longer be supported on future releases of macOS, allow IDLE.app to launch in 64-bit mode. (cherry picked from commit df532ab752680f6e359672c2cd40bec8ac848628) Co-authored-by: Ned Deily <nad@python.org>
Diffstat (limited to 'Mac')
-rw-r--r--Mac/Makefile.in4
1 files changed, 0 insertions, 4 deletions
diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index 1255b13b42..95fd4a2722 100644
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -221,10 +221,6 @@ install_IDLE:
-test -d "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app" && rm -rf "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app"
/bin/cp -PR "$(srcdir)/IDLE/IDLE.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
ln -sf "$(INSTALLED_PYTHONAPP)" "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python"
-ifneq ($(LIPO_32BIT_FLAGS),)
- rm "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python"
- lipo $(LIPO_32BIT_FLAGS) -output "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python" "$(BUILDPYTHON)"
-endif
sed -e "s!%prefix%!$(prefix)!g" -e 's!%exe%!$(PYTHONFRAMEWORK)!g' < "$(srcdir)/IDLE/IDLE.app/Contents/MacOS/IDLE" > "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/IDLE"
sed "s!%version%!`$(RUNSHARED) $(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`!g" < "$(srcdir)/IDLE/IDLE.app/Contents/Info.plist" > "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/Info.plist"
if [ -f "$(DESTDIR)$(LIBDEST)/idlelib/config-main.def" ]; then \