From 61f67fb13521aa25c72442ac257a1f79ffd48283 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 16 Jul 2024 12:27:11 +0000 Subject: [PATCH] Use Python3_EXECUTABLE instead of PYTHON_EXECUTABLE Also drop the unnecessary python version variables. If there are multiple python versions installed, the wrong one may be picked. PYTHON_EXECUTABLE tries to avoid that problem, but the correct way to spell this nowadays is Python3_EXECUTABLE. --- build.spec.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.spec.inc b/build.spec.inc index a579317..29d51d9 100644 --- a/build.spec.inc +++ b/build.spec.inc @@ -49,7 +49,7 @@ cd llvm %if 0%{?fedora} || 0%{?rhel} > 9 -DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=ON \ %endif - -DPYTHON_EXECUTABLE=%{__python3} \ + -DPython3_EXECUTABLE=%{__python3} \ %if %{with compat_build} -DLLVM_INCLUDE_TESTS:BOOL=OFF \ -DCLANG_INCLUDE_TESTS:BOOL=OFF \ @@ -195,8 +195,6 @@ cd llvm -DLLDB_DISABLE_CURSES:BOOL=OFF \ -DLLDB_DISABLE_LIBEDIT:BOOL=OFF \ -DLLDB_DISABLE_PYTHON:BOOL=OFF \ - -DPYTHON_VERSION_MAJOR:STRING=$(%{__python3} -c "import sys; print(sys.version_info.major)") \ - -DPYTHON_VERSION_MINOR:STRING=$(%{__python3} -c "import sys; print(sys.version_info.minor)") \ %ifarch ppc64le -DLLDB_TEST_USER_ARGS=--skip-category=watchpoint \ %endif