diff options
| author | Maxime Coste <mawww@kakoune.org> | 2024-03-23 21:09:27 +1100 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2024-03-23 21:09:27 +1100 |
| commit | 84be263321bc973ea680695e8f53ed55664331d2 (patch) | |
| tree | d896c491b8cca9d49e8300eee7c9d3972c44aac5 | |
| parent | eb09d737ef39a04a30f49a28be01185c261d50db (diff) | |
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
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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) \ |