Switch to gcc-toolset-13-gcc
Resolves: rbhz#2178794
This commit is contained in:
parent
9fc9144a87
commit
fe84d09591
19
clang.spec
19
clang.spec
@ -47,7 +47,7 @@
|
||||
|
||||
Name: %pkg_name
|
||||
Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Summary: A C language family front-end for LLVM
|
||||
|
||||
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
|
||||
%endif
|
||||
|
||||
# RHEL only: We build LLVM with clang, which now defaults to using the
|
||||
# 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
|
||||
# Required to handle LTO debuginfo.
|
||||
BuildRequires: gcc-toolset-%{gts_version}-gdb
|
||||
BuildRequires: clang
|
||||
BuildRequires: cmake
|
||||
@ -199,7 +191,7 @@ libomp-devel to enable -fopenmp.
|
||||
%package libs
|
||||
Summary: Runtime library for clang
|
||||
Requires: %{name}-resource-filesystem%{?_isa} = %{version}
|
||||
Requires: gcc-toolset-12-gcc-c++
|
||||
Requires: gcc-toolset-%{gts_version}-gcc-c++
|
||||
Recommends: compiler-rt%{?_isa} = %{version}
|
||||
# atomic support is not part of compiler-rt
|
||||
Recommends: libatomic%{?_isa}
|
||||
@ -438,7 +430,7 @@ mv ../cmake-%{compat_ver}.src ../cmake
|
||||
-DCLANG_DEFAULT_LINKER=lld \
|
||||
%endif
|
||||
-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
|
||||
|
||||
%cmake_build
|
||||
@ -694,6 +686,9 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
|
||||
|
||||
%endif
|
||||
%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
|
||||
- Use gcc-toolset-13-gdb for gdb-add-index
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user