From 285f42c850da0d8ca31850088eb7b9247cbbbc71 Mon Sep 17 00:00:00 2001 From: Xarblu Date: Thu, 20 Jun 2024 02:48:00 +0200 Subject: [PATCH] GH-120602: Support LLVM_VERSION_SUFFIX for JIT builds (GH-120604) --- .../next/Build/2024-06-19-21-05-15.gh-issue-120602.UyDARz.rst | 2 ++ Tools/jit/_llvm.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Build/2024-06-19-21-05-15.gh-issue-120602.UyDARz.rst 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 00000000000..f0d90ec3bb5 --- /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 45bd69ff861..606f280a14d 100644 --- a/Tools/jit/_llvm.py +++ b/Tools/jit/_llvm.py @@ -9,7 +9,7 @@ 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")