]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.13] GH-120602: Support LLVM_VERSION_SUFFIX for JIT builds (GH-120768)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Thu, 20 Jun 2024 01:13:23 +0000 (03:13 +0200)
committerGitHub <noreply@github.com>
Thu, 20 Jun 2024 01:13:23 +0000 (01:13 +0000)
(cherry picked from commit 285f42c850da0d8ca31850088eb7b9247cbbbc71)

Co-authored-by: Xarblu <xarblu@protonmail.com>
Misc/NEWS.d/next/Build/2024-06-19-21-05-15.gh-issue-120602.UyDARz.rst [new file with mode: 0644]
Tools/jit/_llvm.py

diff --git a/Misc/NEWS.d/next/Build/2024-06-19-21-05-15.gh-issue-120602.UyDARz.rst b/Misc/NEWS.d/next/Build/2024-06-19-21-05-15.gh-issue-120602.UyDARz.rst
new file mode 100644 (file)
index 0000000..f0d90ec
--- /dev/null
@@ -0,0 +1,2 @@
+Correctly handle LLVM installs with ``LLVM_VERSION_SUFFIX`` when building
+with ``--enable-experimental-jit``.
index 45bd69ff861b56b9af9250c8312f91179f895298..606f280a14d974ed7c6bc0be435a55af66233bfb 100644 (file)
@@ -9,7 +9,7 @@ import subprocess
 import typing
 
 _LLVM_VERSION = 18
-_LLVM_VERSION_PATTERN = re.compile(rf"version\s+{_LLVM_VERSION}\.\d+\.\d+\s+")
+_LLVM_VERSION_PATTERN = re.compile(rf"version\s+{_LLVM_VERSION}\.\d+\.\d+\S*\s+")
 
 _P = typing.ParamSpec("_P")
 _R = typing.TypeVar("_R")