From 84be263321bc973ea680695e8f53ed55664331d2 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Sat, 23 Mar 2024 21:09:27 +1100
Subject: [PATCH] Re-change how compiler detection is done

Turns out GCC does not appear in many gcc version, go back to
checking `g++` and assume `c++` means `g++`

Fixes #5119
---
 Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8c1b5862..93bd7648 100644
--- a/Makefile
+++ b/Makefile
@@ -63,11 +63,10 @@ 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|GCC' | head -1
-#CXXFLAGS-compiler-clang = -frelaxed-template-template-args -Wno-ambiguous-reversed-operator
-#CXXFLAGS-compiler-GCC = -Wno-init-list-lifetime
+compiler != $(CXX) --version | grep -E -o 'clang|g\+\+|c\+\+' | head -1
 CXXFLAGS-compiler-clang = -fsized-deallocation
-CXXFLAGS-compiler-GCC = -Wno-init-list-lifetime -Wno-stringop-overflow
+CXXFLAGS-compiler-g++ = -Wno-init-list-lifetime -Wno-stringop-overflow
+CXXFLAGS-compiler-c++ = $(CXXFLAGS-compiler-g++)
 
 KAK_CPPFLAGS = \
 	$(CPPFLAGS-default) \