[PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS

Jes Sorensen
2020-05-20T21:25:55Z

Package managers such as RPM wants to build everything with their
preferred flags, and we shouldn't hard override flags.

Signed-off-by: Jes Sorensen <jsorensen@fb.com>
---
Makefile | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index e7fb5cf..18f08c3 100644
--- a/Makefile
+++ b/Makefile
@@ -29,16 +29,12 @@
cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null &>/dev/null; \
then echo $(1); fi)

-#### Common compiler flags. You can add additional flags by defining CFLAGS
-#### and/or CPPFLAGS in the environment or on the 'make' command line.
-
-override CFLAGS := -O2 -Wall -Wundef \
+CFLAGS := -O2 -Wall -Wundef \
$(call cc-option,-Wdeclaration-after-statement) \
$(call cc-option,-Wmissing-prototypes) \
$(call cc-option,-Wstrict-prototypes) \
$(call cc-option,-Wvla) \
- $(call cc-option,-Wimplicit-fallthrough) \
- $(CFLAGS)
+ $(call cc-option,-Wimplicit-fallthrough)

override CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)

--
2.26.2