From e38becb5a1777b7c551376f9718374ba0a961d78 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Fri, 1 Mar 2024 12:08:04 +1100 Subject: [PATCH] Fix GCC detection in Makefile When called as `c++`, gcc will not output `g++` which breaks detection, it will have GCC in the output so look for that string instead. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d336bff74..1643b6d63 100644 --- a/Makefile +++ b/Makefile @@ -63,11 +63,11 @@ LIBS-os-Windows = -ldbghelp CXXFLAGS-default = -std=c++2a -Wall -Wextra -pedantic -Wno-unused-parameter -Wno-sign-compare -compiler != $(CXX) --version | grep -E -o 'clang|g\+\+' | head -1 +compiler != $(CXX) --version | grep -E -o 'clang|GCC' | head -1 #CXXFLAGS-compiler-clang = -frelaxed-template-template-args -Wno-ambiguous-reversed-operator -#CXXFLAGS-compiler-g++ = -Wno-init-list-lifetime +#CXXFLAGS-compiler-GCC = -Wno-init-list-lifetime CXXFLAGS-compiler-clang = -CXXFLAGS-compiler-g++ = -Wno-init-list-lifetime -Wno-stringop-overflow +CXXFLAGS-compiler-GCC = -Wno-init-list-lifetime -Wno-stringop-overflow KAK_CPPFLAGS = \ $(CPPFLAGS-default) \