From: Xarblu <xarblu@protonmail.com>
Date: Thu, 20 Jun 2024 00:48:00 +0000 (+0200)
Subject: GH-120602: Support LLVM_VERSION_SUFFIX for JIT builds (GH-120604)
X-Git-Tag: v3.14.0a1~1401
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=285f42c850da0d8ca31850088eb7b9247cbbbc71;p=thirdparty%2FPython%2Fcpython.git

GH-120602: Support LLVM_VERSION_SUFFIX for JIT builds (GH-120604)
---

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
index 000000000000..f0d90ec3bb50
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2024-06-19-21-05-15.gh-issue-120602.UyDARz.rst
@@ -0,0 +1,2 @@
+Correctly handle LLVM installs with ``LLVM_VERSION_SUFFIX`` when building
+with ``--enable-experimental-jit``.
diff --git a/Tools/jit/_llvm.py b/Tools/jit/_llvm.py
index 45bd69ff861b..606f280a14d9 100644
--- a/Tools/jit/_llvm.py
+++ b/Tools/jit/_llvm.py
@@ -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")