rpms/clang
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Switch to gcc-toolset-13-gcc

Browse Source 
Resolves: rbhz#2178794
This commit is contained in:
Nikita Popov 2023-06-30 10:36:53 +02:00
parent 9fc9144a87
commit fe84d09591
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clang.spec
View File

@ -47,7 +47,7 @@
Name: %pkg_name Name: %pkg_name
Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}} Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}
Release: 5%{?dist} Release: 6%{?dist}
Summary: A C language family front-end for LLVM Summary: A C language family front-end for LLVM
License: Apache-2.0 WITH LLVM-exception OR NCSA License: Apache-2.0 WITH LLVM-exception OR NCSA
@ -100,15 +100,7 @@ Patch13: 0001-Driver-Give-devtoolset-path-precedence-over-Installe.patch
Patch201: 0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch Patch201: 0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
%endif %endif
# RHEL only: We build LLVM with clang, which now defaults to using the # Required to handle LTO debuginfo.
# libstdc++ from gcc-toolset-12. Since we're linking some clang
# tools statically to some static libraries from LLVM, we
# need to use libstdc++12 as well. So, use gcc-toolset-12
# to compile clang.
# TODO: Update to use gts_version.
BuildRequires: gcc-toolset-12-gcc-c++
BuildRequires: gcc-toolset-12-annobin-plugin-gcc
BuildRequires: gcc-toolset-12-libatomic-devel
BuildRequires: gcc-toolset-%{gts_version}-gdb BuildRequires: gcc-toolset-%{gts_version}-gdb
BuildRequires: clang BuildRequires: clang
BuildRequires: cmake BuildRequires: cmake
@ -199,7 +191,7 @@ libomp-devel to enable -fopenmp.
%package libs %package libs
Summary: Runtime library for clang Summary: Runtime library for clang
Requires: %{name}-resource-filesystem%{?_isa} = %{version} Requires: %{name}-resource-filesystem%{?_isa} = %{version}
Requires: gcc-toolset-12-gcc-c++ Requires: gcc-toolset-%{gts_version}-gcc-c++
Recommends: compiler-rt%{?_isa} = %{version} Recommends: compiler-rt%{?_isa} = %{version}
# atomic support is not part of compiler-rt # atomic support is not part of compiler-rt
Recommends: libatomic%{?_isa} Recommends: libatomic%{?_isa}
@ -438,7 +430,7 @@ mv ../cmake-%{compat_ver}.src ../cmake
-DCLANG_DEFAULT_LINKER=lld \ -DCLANG_DEFAULT_LINKER=lld \
%endif %endif
-DCLANG_DEFAULT_UNWINDLIB=libgcc \ -DCLANG_DEFAULT_UNWINDLIB=libgcc \
-DGCC_INSTALL_PREFIX=/opt/rh/gcc-toolset-12/root/usr \ -DGCC_INSTALL_PREFIX=/opt/rh/gcc-toolset-%{gts_version}/root/usr \
-DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF
%cmake_build %cmake_build
@ -694,6 +686,9 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
%endif %endif
%changelog %changelog
* Fri Jun 30 2023 Nikita Popov <npopov@redhat.com> - 16.0.1-6
- Switch to gcc-toolset-13-gcc
* Thu Jun 29 2023 Nikita Popov <npopov@redhat.com> - 16.0.1-5 * Thu Jun 29 2023 Nikita Popov <npopov@redhat.com> - 16.0.1-5
- Use gcc-toolset-13-gdb for gdb-add-index - Use gcc-toolset-13-gdb for gdb-add-index