From 8e0f66c2d2e3ec183968a87ef303f586eab73dc0 Mon Sep 17 00:00:00 2001
From: Nikita Popov <npopov@redhat.com>
Date: Wed, 31 Jul 2024 12:55:15 +0000
Subject: [PATCH] Misc fixes and cleanup

---
 globals.spec.inc  | 20 ++------------------
 install.spec.inc  |  8 --------
 packages.spec.inc |  8 --------
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/globals.spec.inc b/globals.spec.inc
index 3c6ed10..2280164 100644
--- a/globals.spec.inc
+++ b/globals.spec.inc
@@ -98,21 +98,12 @@
 
 #region CLANG globals
 
-%global pkg_name_clang clang
-
-%if %{with compat_build}
-%global pkg_name_clang clang%{maj_ver}
-# Install clang to same prefix as llvm, so that apps that use llvm-config
-# will also be able to find clang libs.
-%global pkg_includedir %{install_prefix}/include
-%endif
+%global pkg_name_clang clang%{pkg_suffix}
 
 #endregion
 
 #region COMPILER-RT globals
 
-%if %{without compat_build}
-
 %global pkg_name_compiler_rt compiler-rt%{pkg_suffix}
 
 # TODO(kkleine): do these optflags hurt llvm and/or clang?
@@ -125,9 +116,6 @@
 
 # Copy CFLAGS into ASMFLAGS, so -fcf-protection is used when compiling assembly files.
 # export ASMFLAGS=$CFLAGS
-
-%endif
-
 #endregion
 
 #region OPENMP globals
@@ -149,11 +137,7 @@
 #endregion
 
 #region LLD globals
-%if %{with compat_build}
-%global pkg_name_lld lld%{maj_ver}
-%else
-%global pkg_name_lld lld
-%endif
+%global pkg_name_lld lld%{pkg_suffix}
 #endregion
 
 #region LLDB globals
diff --git a/install.spec.inc b/install.spec.inc
index 5e1feca..7dcfa0e 100644
--- a/install.spec.inc
+++ b/install.spec.inc
@@ -210,8 +210,6 @@ echo "--gcc-triple=%{_target_cpu}-redhat-linux" >> %{buildroot}%{_sysconfdir}/%{
 
 #region COMPILER-RT installation
 
-%if %{without compat_build}
-
 # Triple where compiler-rt libs are installed. If it differs from llvm_triple, then there is
 # also a symlink llvm_triple -> compiler_rt_triple.
 %global compiler_rt_triple %{llvm_triple}
@@ -231,14 +229,10 @@ ln -s %{compiler_rt_triple} %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/%{ll
 %endif
 %endif
 
-%endif
-
 #endregion
 
 #region OPENMP installation
 
-%if %{without compat_build}
-
 # Remove static libraries with equivalent shared libraries
 rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 
@@ -254,8 +248,6 @@ rm %{buildroot}%{install_bindir}/llvm-omp-device-info
 rm %{buildroot}%{install_bindir}/llvm-omp-kernel-replay
 %endif
 
-%endif
-
 #endregion
 
 #region LLD installation
diff --git a/packages.spec.inc b/packages.spec.inc
index 5d14f8b..cee6a90 100644
--- a/packages.spec.inc
+++ b/packages.spec.inc
@@ -216,8 +216,6 @@ Requires:      python3
 
 #region COMPILER-RT packages
 
-%if %{without compat_build}
-
 %package -n %{pkg_name_compiler_rt}
 Summary:	LLVM "compiler-rt" runtime libraries
 
@@ -232,14 +230,10 @@ implementation of the low-level target-specific hooks required by
 code generation, sanitizer runtimes and profiling library for code
 instrumentation, and Blocks C language extension.
 
-%endif
-
 #endregion
 
 #region OPENMP packages
 
-%if %{without compat_build}
-
 %package -n %{pkg_name_libomp}
 Summary: OpenMP runtime for clang
 
@@ -262,8 +256,6 @@ Requires: clang-resource-filesystem%{?isa} = %{version}
 OpenMP header files.
 URL: http://openmp.llvm.org
 
-%endif
-
 #endregion
 
 #region LLD packages