From d1dd775554c15bbf2e97b163806bc6dc4bd3596f Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Mon, 30 Nov 2020 10:25:54 -0500
Subject: Makefile: Clean up flag handling a bit

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index cff49e5..3dd263f 100644
--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,9 @@ INSTALL ?= install
 MKDIR ?= mkdir -p
 RM ?= rm -f
 
-WFLAGS ?= -Wall -Wmissing-declarations -Wstrict-prototypes -Wsign-compare
-CFLAGS ?= -g $(WFLAGS)
+DEFAULT_CFLAGS ?= -g -Wall -Wmissing-declarations -Wstrict-prototypes -Wsign-compare
+
+CFLAGS ?= $(DEFAULT_CFLAGS)
 LDFLAGS ?=
 DEPFLAGS ?= -MD -MP -MF $(@:.o=.d)
 
@@ -59,7 +60,6 @@ LOCAL_LDLIBS :=
 ASAN_CFLAGS := -fsanitize=address
 MSAN_CFLAGS := -fsanitize=memory -fsanitize-memory-track-origins
 UBSAN_CFLAGS := -fsanitize=undefined
-SANFLAGS := -fno-sanitize-recover
 
 ifeq ($(OS),Linux)
 LOCAL_LDFLAGS += -Wl,--as-needed
@@ -97,7 +97,7 @@ LOCAL_CFLAGS += --coverage
 endif
 
 ifneq ($(filter release,$(MAKECMDGOALS)),)
-CFLAGS := -g $(WFLAGS) -O3 -flto -DNDEBUG
+CFLAGS := $(DEFAULT_CFLAGS) -O3 -flto -DNDEBUG
 endif
 
 ALL_CPPFLAGS = $(LOCAL_CPPFLAGS) $(CPPFLAGS)
-- 
cgit v1.2.3