From: Ned Deily <nad@python.org>
Date: Tue, 5 Apr 2022 04:46:09 +0000 (-0400)
Subject: bpo-45847: Adapt macOS installer build to use new tkinter configure vars (GH-32328)
X-Git-Tag: v3.11.0a7~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0c700480b52dffab830d52e9c4eba15d4b57a89;p=thirdparty%2FPython%2Fcpython.git

bpo-45847: Adapt macOS installer build to use new tkinter configure vars (GH-32328)
---

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 27719b85f1f5..1fb6749fc7d5 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -1157,11 +1157,11 @@ def buildPython():
         (' ', '--without-ensurepip ')[PYTHON_3],
         (' ', "--with-openssl='%s/libraries/usr/local'"%(
                             shellQuote(WORKDIR)[1:-1],))[PYTHON_3],
-        (' ', "--with-tcltk-includes='-I%s/libraries/usr/local/include'"%(
+        (' ', "--enable-optimizations --with-lto")[compilerCanOptimize()],
+        (' ', "TCLTK_CFLAGS='-I%s/libraries/usr/local/include'"%(
                             shellQuote(WORKDIR)[1:-1],))[internalTk()],
-        (' ', "--with-tcltk-libs='-L%s/libraries/usr/local/lib -ltcl8.6 -ltk8.6'"%(
+        (' ', "TCLTK_LIBS='-L%s/libraries/usr/local/lib -ltcl8.6 -ltk8.6'"%(
                             shellQuote(WORKDIR)[1:-1],))[internalTk()],
-        (' ', "--enable-optimizations --with-lto")[compilerCanOptimize()],
         shellQuote(WORKDIR)[1:-1],
         shellQuote(WORKDIR)[1:-1]))