]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-45847: Adapt macOS installer build to use new tkinter configure vars (GH-32328)
authorNed Deily <nad@python.org>
Tue, 5 Apr 2022 04:46:09 +0000 (00:46 -0400)
committerGitHub <noreply@github.com>
Tue, 5 Apr 2022 04:46:09 +0000 (00:46 -0400)
Mac/BuildScript/build-installer.py

index 27719b85f1f501e2f7fd302da7a008647b459b35..1fb6749fc7d5b7fc3ff7b519bf2dc287d50ba612 100755 (executable)
@@ -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]))