diff --git a/build.spec.inc b/build.spec.inc
index bca74e7..7aa2cff 100644
--- a/build.spec.inc
+++ b/build.spec.inc
@@ -82,19 +82,15 @@ popd
 	\
 	\
 	\
-%if %{without compat_build}
 -DLLVM_ENABLE_RUNTIMES="compiler-rt;openmp;offload" \
-%endif
 	\
 	\
 	\
 	\
 	\
-%if %{without compat_build}
 	-DCOMPILER_RT_INSTALL_PATH=%{_prefix}/lib/clang/%{maj_ver} \
 	-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON \
 	-DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF \
-%endif
 	\
 	\
 	\
diff --git a/globals.spec.inc b/globals.spec.inc
index 2cb9c5e..74f3f71 100644
--- a/globals.spec.inc
+++ b/globals.spec.inc
@@ -113,7 +113,7 @@
 
 %if %{without compat_build}
 
-%global pkg_name_compiler_rt compiler-rt
+%global pkg_name_compiler_rt compiler-rt%{pkg_suffix}
 
 # TODO(kkleine): do these optflags hurt llvm and/or clang?