rpms/llvm
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/llvm.git synced 2024-11-28 10:35:42 +00:00
Code Issues 5 Projects Releases Packages Wiki Activity Actions

Misc fixes and cleanup

Browse source
This commit is contained in:
Nikita Popov 2024-07-31 12:55:15 +00:00
parent 4b52059c16
commit 06529b4e5c
3 changed files with 2 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
globals.spec.inc
View file

@ -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

8
install.spec.inc
View file

@ -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-offload-device-info
rm %{buildroot}%{install_bindir}/llvm-omp-kernel-replay
%endif
%endif
#endregion
#region LLD installation

8
packages.spec.inc
View file

@ -215,8 +215,6 @@ Requires: python3
#region COMPILER-RT packages
%if %{without compat_build}
%package -n %{pkg_name_compiler_rt}
Summary: LLVM "compiler-rt" runtime libraries
@ -231,14 +229,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
@ -261,8 +255,6 @@ Requires: clang-resource-filesystem%{?isa} = %{version}
OpenMP header files.
URL: http://openmp.llvm.org
%endif
#endregion
#region LLD packages