summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2024-06-20 01:13:23 (GMT)
committerGitHub <noreply@github.com>2024-06-20 01:13:23 (GMT)
commit6b714d545f5ae7712c9246b6083c9573ad24257d (patch)
tree099777658bc9feb21daa658b44bc9441ec9c1ee7
parente415d2561b0410c21ab8627aa10b90b1145b1c70 (diff)
downloadcpython-6b714d545f5ae7712c9246b6083c9573ad24257d.zip
cpython-6b714d545f5ae7712c9246b6083c9573ad24257d.tar.gz
cpython-6b714d545f5ae7712c9246b6083c9573ad24257d.tar.bz2
[3.13] GH-120602: Support LLVM_VERSION_SUFFIX for JIT builds (GH-120768)
(cherry picked from commit 285f42c850da0d8ca31850088eb7b9247cbbbc71) Co-authored-by: Xarblu <xarblu@protonmail.com>
-rw-r--r--Misc/NEWS.d/next/Build/2024-06-19-21-05-15.gh-issue-120602.UyDARz.rst2
-rw-r--r--Tools/jit/_llvm.py2
2 files changed, 3 insertions, 1 deletions
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 0000000..f0d90ec
--- /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 45bd69f..606f280 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")