From aff3c1fcf716cfe384aefb724ae1841df8311487 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 30 Apr 2025 13:19:22 +0200 Subject: [PATCH] Upgrade to gcc-toolset-14 for rhel-8.10 Related: RHEL-87830 --- firefox.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/firefox.spec b/firefox.spec index 22ccb27..151eb46 100644 --- a/firefox.spec +++ b/firefox.spec @@ -118,7 +118,7 @@ end} %if 0%{?rhel} > 7 && 0%{?rhel} < 10 %global use_gcc_ts 1 - %if 0%{?rhel} == 9 && %{rhel_minor_version} >= 6 + %if (0%{?rhel} == 9 && %{rhel_minor_version} >= 6) || (0%{?rhel} == 8 && %{rhel_minor_version} >= 10) # clang depends on gcc-toolset-14-gcc-c++ %global gts_version 14 %else @@ -483,8 +483,9 @@ BuildRequires: gcc-toolset-%{gts_version}-runtime BuildRequires: gcc-toolset-%{gts_version}-binutils BuildRequires: gcc-toolset-%{gts_version}-gcc BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin -# Do not explicitly require gcc-toolset-%{gts_version}-gcc-g++ instead fail +# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-c++ instead fail # when clang is upgraded to depend on a later toolset and adjust version. +# ERROR: The target C compiler is version 13.3.1, while the target C++ compiler is version 8.5.0. Need to use the same compiler version. %endif Requires: mozilla-filesystem