From de59aa9cfb4d909d92f50f3f8a1785e77fce8dab Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 30 Jun 2023 16:14:50 -0700 Subject: [PATCH] Use gcc-toolset-13 by default Resolves: rhbz#2178804 --- clang.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/clang.spec b/clang.spec index a57a971..f073e86 100644 --- a/clang.spec +++ b/clang.spec @@ -42,7 +42,7 @@ Name: %pkg_name Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A C language family front-end for LLVM License: NCSA @@ -177,8 +177,8 @@ libomp-devel to enable -fopenmp. %package libs Summary: Runtime library for clang Requires: %{name}-resource-filesystem%{?_isa} = %{version} -# RHEL specific: Use libstdc++ from gcc12 by default. rhbz#2064507 -Requires: gcc-toolset-12-gcc-c++ +# RHEL specific: Use libstdc++ from gcc13 by default. rhbz#2178804 +Requires: gcc-toolset-13-gcc-c++ Recommends: compiler-rt%{?_isa} = %{version} # libomp-devel is required, so clang can find the omp.h header when compiling # with -fopenmp. @@ -395,7 +395,7 @@ CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized" -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-13/root/usr %cmake_build @@ -624,6 +624,9 @@ false %endif %changelog +* Thu Jun 29 2023 Tom Stellard - 16.0.6-2 +- Use gcc-toolset-13 by default + * Sat Jun 17 2023 Tom Stellard - 16.0.6-1 - 16.0.6 Release