fix the bugfix for gcc-toolset-11

2022-12-23 14:58:47 +01:00
parent cb4cb6f4d7
commit 8bad990471
1 changed files with 11 additions and 3 deletions
@@ -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