import clang-13.0.1-2.module+el8.6.0+15487+86bd2a95

SPECS/clang.spec

@@ -76,9 +76,15 @@
 %bcond_with python3
 %endif
 
+%if 0%{?rhel}
+%global gcc_toolset_version 11
+%global gcc_pkg_prefix gcc-toolset-%{gcc_toolset_version}-
+%global gcc_install_prefix /opt/rh/gcc-toolset-%{gcc_toolset_version}/root/usr/
+%endif
+
 Name:		%pkg_name
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	NCSA
@@ -178,8 +184,8 @@ Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 # clang requires gcc, clang++ requires libstdc++-devel
 # - https://bugzilla.redhat.com/show_bug.cgi?id=1021645
 # - https://bugzilla.redhat.com/show_bug.cgi?id=1158594
-Requires:	libstdc++-devel
-Requires:	gcc-c++
+Requires:	%{?gcc_pkg_prefix}libstdc++-devel
+Requires:	%{?gcc_pkg_prefix}gcc-c++
 
 Provides:	clang(major) = %{maj_ver}
 
@@ -385,6 +391,7 @@ cd %{_vpath_builddir}
 	\
 	-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
 	-DBUILD_SHARED_LIBS=OFF \
+	%{?gcc_install_prefix:-DGCC_INSTALL_PREFIX=%{gcc_install_prefix}} \
 	-DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}" \
 	-DCLANG_DEFAULT_UNWINDLIB=libgcc
 
@@ -587,6 +594,10 @@ false
 
 %endif
 %changelog
+* Tue May 24 2022 Tom Stellard <tstellar@redhat.com> - 13.0.1-2
+- Use libstdc++ from gcc-toolset-11
+- Resolves: rhbz#2088672
+
 * Thu Feb 03 2022 Tom Stellard <tstellar@redhat.com> - 13.0.1-1
 - 13.0.1 Release