From 270648064548e18fbc1e56601d78ebd234363a18 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Fri, 1 Nov 2019 15:53:23 +0100 Subject: [PATCH 1/2] Actually properly fix the Makefile Signed-off-by: Gabriel Ravier --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b1062cd1..d80c6cba 100644 --- a/Makefile +++ b/Makefile @@ -48,11 +48,12 @@ ifeq ($(WARNINGS), 1) endif ifeq ($(ALL_WARNINGS), 1) - ifneq ($(findstring clang,$(CXX),)) + ifneq ($(findstring clang,$(CXX)),) # Use clang-specific flag -Weverything CXXFLAGS += -Weverything else - @echo Couldn\'t activate all warnings (Unsupported compiler) + # This is indented with spaces because otherwise it doesn't compile (make doesn't like tabs there for some reason) + $(warning Couldn\'t activate all warnings (Unsupported compiler)) endif endif From 2cc6d1d75805e715d7a314bb27ccf6c306a1aaec Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sat, 2 Nov 2019 20:17:21 +0000 Subject: [PATCH 2/2] Update warning option names in Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d80c6cba..0c9fd927 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ ifeq ($(WARNINGS), 1) CXXFLAGS += -Wall -Wextra -pedantic endif -ifeq ($(ALL_WARNINGS), 1) +ifeq ($(WARNINGS_ALL), 1) ifneq ($(findstring clang,$(CXX)),) # Use clang-specific flag -Weverything CXXFLAGS += -Weverything @@ -57,7 +57,7 @@ ifeq ($(ALL_WARNINGS), 1) endif endif -ifeq ($(FATAL_WARNINGS), 1) +ifeq ($(WARNINGS_FATAL), 1) CXXFLAGS += -Werror endif