From 1bfe3dec3ced6fa00d58293c5e419b4f6ae5add9 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 10 Jun 2022 09:02:08 +0200 Subject: [PATCH] use gcc 11 from gcc-toolset for RHEL8 --- configure/os/CONFIG.Common.RHEL8-x86_64 | 3 --- configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64 | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure/os/CONFIG.Common.RHEL8-x86_64 b/configure/os/CONFIG.Common.RHEL8-x86_64 index a4ac7c32f..757bcb323 100644 --- a/configure/os/CONFIG.Common.RHEL8-x86_64 +++ b/configure/os/CONFIG.Common.RHEL8-x86_64 @@ -1,5 +1,2 @@ # Include definitions common to linux pentium targets include $(CONFIG)/os/CONFIG.Common.linux-x86_64 - -# highest c++ standard that is compiler can do -STD_CXXFLAGS = -std=c++2a diff --git a/configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64 b/configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64 index 2bf7aace1..3a8106990 100644 --- a/configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64 +++ b/configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64 @@ -1,2 +1,8 @@ # Include common linux definitions include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 + +# Use gcc 11 from gcc-toolset-11 +GNU_BIN = /opt/rh/gcc-toolset-11/root/usr/bin +# Fix bug in gcc-toolset-11 calling the old assembler +TARGET_CFLAGS = -B$(GNU_BIN) +STD_CXXFLAGS = -std=c++17