Pass CFLAGS to the JIT

Author: zanieb

cpython-unix/build-cpython.sh

@@ -83,6 +83,10 @@ else
     patch -p1 -i ${ROOT}/patch-xopen-source-ios-legacy.patch
 fi
 
+if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
+   patch -p1 -i ${ROOT}/cpython-unix/patch-jit-clfags.patch
+fi
+
 # LIBTOOL_CRUFT is unused and breaks cross-compiling on macOS. Nuke it.
 # Submitted upstream at https://github.com/python/cpython/pull/101048.
 if [ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_11}" ]; then

cpython-unix/patch-jit-clfags.patch

@@ -0,0 +1,47 @@
+diff --git a/Tools/jit/build.py b/Tools/jit/build.py
+index 9de6fd7dfda..49a1b11de47 100644
+--- a/Tools/jit/build.py
++++ b/Tools/jit/build.py
+@@ -27,14 +27,14 @@
+         "-v", "--verbose", action="store_true", help="echo commands as they are run"
+     )
+     parser.add_argument(
+-        "--cflags", help="additional flags to pass to the compiler", default=""
++        "--with-cflags", help="additional flags to pass to the compiler", default=""
+     )
+     args = parser.parse_args()
+     for target in args.target:
+         target.debug = args.debug
+         target.force = args.force
+         target.verbose = args.verbose
+-        target.cflags = args.cflags
++        target.cflags = args.with_cflags
+         target.build(
+             out,
+             comment=comment,
+diff --git a/configure b/configure
+index c51192f12c8..0dcef7c2617 100755
+--- a/configure
++++ b/configure
+@@ -10863,7 +10863,7 @@ then :
+ 
+ else case e in #(
+   e) as_fn_append CFLAGS_NODIST " $jit_flags"
+-           REGEN_JIT_COMMAND="\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py ${ARCH_TRIPLES:-$host}"
++           REGEN_JIT_COMMAND="\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py ${ARCH_TRIPLES:-$host} --with-cflags=\"\$(CONFIGURE_CFLAGS)\""
+            JIT_STENCILS_H="jit_stencils.h"
+            if test "x$Py_DEBUG" = xtrue
+ then :
+diff --git a/configure.ac b/configure.ac
+index 6fc7b466b64..5998f896a4e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2776,7 +2776,7 @@ AS_VAR_IF([jit_flags],
+           [],
+           [AS_VAR_APPEND([CFLAGS_NODIST], [" $jit_flags"])
+            AS_VAR_SET([REGEN_JIT_COMMAND],
+-                      ["\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py ${ARCH_TRIPLES:-$host} --cflags \$(CLFAGS)"])
++                      ["\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py ${ARCH_TRIPLES:-$host} --with-cflags=\"\$(CONFIGURE_CFLAGS)\""])
+            AS_VAR_SET([JIT_STENCILS_H], ["jit_stencils.h"])
+            AS_VAR_IF([Py_DEBUG],
+                      [true],