From 8bad9904716c1d9fcfdd1cf32f6034c02afe9d22 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Fri, 23 Dec 2022 14:58:47 +0100
Subject: [PATCH] fix the bugfix for gcc-toolset-11

---
 configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64 | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64 b/configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64
index 693b45b58..fb55d4981 100644
--- a/configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64
+++ b/configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64
@@ -1,8 +1,16 @@
 # 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
+TOOLSET = gcc-toolset-11
+TOOLSET_LOCATION = /opt/rh
+TOOLSET_DIR = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
+GNU_BIN = $(TOOLSET_DIR)/bin
+
 # Fix bug in gcc-toolset-11 calling the old assembler
-TARGET_CFLAGS += -B$(GNU_BIN)
+# Also gcc-toolset-11 requires gcc-toolset-11-annobin-plugin-gcc
+# while the others only need  gcc-toolset-*-toolchain
+ifneq ($(filter %-11,$(TOOLSET)),)
+PATH:=$(GNU_BIN):$(PATH)
+endif
+
 STD_CXXFLAGS = -std=c++17