diff --git a/llvm.spec b/llvm.spec index 9805bdf..1f0bf5b 100644 --- a/llvm.spec +++ b/llvm.spec @@ -148,7 +148,7 @@ %global unprefixed_libdir lib %if 0%{?rhel} -%global targets_to_build "X86;AMDGPU;PowerPC;NVPTX;SystemZ;AArch64;ARM;Mips;BPF;WebAssembly" +%global targets_to_build "X86;AMDGPU;PowerPC;NVPTX;SystemZ;AArch64;BPF;WebAssembly" %global experimental_targets_to_build "" %else %global targets_to_build "all" @@ -239,7 +239,7 @@ #region main package Name: %{pkg_name_llvm} Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Low Level Virtual Machine License: Apache-2.0 WITH LLVM-exception OR NCSA @@ -1449,6 +1449,8 @@ fi cd .. %if %{with bundle_compat_lib} +# MIPS and Arm targets were disabled in LLVM 20, but we still need them +# enabled for the compat libraries. %cmake -S ../llvm-project-%{compat_ver}.src/llvm -B ../llvm-compat-libs -G Ninja \ -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_libdir}/llvm%{compat_maj_ver}/ \ -DCMAKE_SKIP_RPATH=ON \ @@ -1456,7 +1458,11 @@ cd .. -DLLVM_ENABLE_PROJECTS="clang;lldb" \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DLLVM_INCLUDE_TESTS=OFF \ - %{cmake_common_args} + %{cmake_common_args} \ +%if %{maj_ver} <= 20 + -DLLVM_TARGETS_TO_BUILD="$(echo %{targets_to_build});Mips;ARM" \ +%endif + %{nil} %ninja_build -C ../llvm-compat-libs LLVM %ninja_build -C ../llvm-compat-libs libclang.so @@ -3021,6 +3027,9 @@ fi #region changelog %changelog +* Fri Apr 04 2025 Tom Stellard - 20.1.1-3 +- Drop ARM and Mips targets + * Wed Mar 19 2025 Nikita Popov - 20.1.1-1 - Update to LLVM 20.1.1