Merge remote-tracking branch 'lenormf/fix-Makefile-compiler-string'

This commit is contained in:
Maxime Coste 2020-03-13 08:06:42 +11:00
commit 83a17227a5

View File

@ -95,7 +95,7 @@ CXXFLAGS += -pedantic -std=c++17 -g -Wall -Wextra -Wno-unused-parameter -Wno-sig
compiler := $(shell $(CXX) --version) compiler := $(shell $(CXX) --version)
ifneq (,$(findstring clang,$(compiler))) ifneq (,$(findstring clang,$(compiler)))
CXXFLAGS += -frelaxed-template-template-args CXXFLAGS += -frelaxed-template-template-args
else ifneq (,$(findstring GCC,$(compiler))) else ifneq (,$(findstring g++,$(compiler)))
CXXFLAGS += -Wno-init-list-lifetime CXXFLAGS += -Wno-init-list-lifetime
endif endif