xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GCC detection in Makefile

Browse Source 
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.
This commit is contained in:
Maxime Coste 2024-03-01 12:08:04 +11:00
parent 504b074aa7
commit e38becb5a1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -63,11 +63,11 @@ LIBS-os-Windows = -ldbghelp
CXXFLAGS-default = -std=c++2a -Wall -Wextra -pedantic -Wno-unused-parameter -Wno-sign-compare 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-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-clang =
CXXFLAGS-compiler-g++ = -Wno-init-list-lifetime -Wno-stringop-overflow CXXFLAGS-compiler-GCC = -Wno-init-list-lifetime -Wno-stringop-overflow
KAK_CPPFLAGS = \ KAK_CPPFLAGS = \
$(CPPFLAGS-default) \ $(CPPFLAGS-default) \