Revert "upgrade to gcc 15"

This reverts commit 3e5789afa6.
Because we may have compatibility problems with gcc 15.
This commit is contained in:
zimoch committed 2026-10-02 15:51:23 +02:00
1 parent fba76ea5a5
commit b3cc5e33aa
4 files changed
+5 -8

No files matched your search

+1 -2
View File
@@ -4,9 +4,8 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86_64
BUILD_CLASS = HOST
TOOLSET_LOCATION = /opt/rh
TOOLSET = gcc-toolset-15
TOOLSET = gcc-toolset-12
STD_CXXFLAGS = -std=c++20
STD_CFLAGS = -std=c17
# Fix bug in gcc-toolset-11 calling the old assembler
ifneq ($(filter %-11,$(TOOLSET)),)
+1 -2
View File
@@ -4,9 +4,8 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86_64
BUILD_CLASS = HOST
TOOLSET_LOCATION = /opt/rh
TOOLSET = gcc-toolset-15
TOOLSET = gcc-toolset-12
STD_CXXFLAGS = -std=c++20
STD_CFLAGS = -std=c17
# Fix bug in gcc-toolset-11 calling the old assembler
ifneq ($(filter %-11,$(TOOLSET)),)
@@ -12,7 +12,6 @@ COMMANDLINE_LIBRARY = READLINE
USR_CXXFLAGS += $(STD_CXXFLAGS)
STD_CXXFLAGS = -std=c++11
USR_CFLAGS += $(STD_CFLAGS)
TOOLSET_DIR = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
+3 -3
View File
@@ -53,10 +53,10 @@ BuildRequires: wine
Summary: Minimal stuff needed to build EPICS host apps
Requires: %{name} = %{version}-%{release}
# This EPICS installation uses the toolset 15 compiler
# This EPICS installation uses the toolset 12 compiler
%if 0%{?rhel} >= 8
Requires: gcc-toolset-15-gcc-c++
BuildRequires: gcc-toolset-15-gcc-c++
Requires: gcc-toolset-12-gcc-c++
BuildRequires: gcc-toolset-12-gcc-c++
%endif
# The perl stuff we need