From 4be898b91d0ee7545fa7309a448924e88dd754b3 Mon Sep 17 00:00:00 2001 From: Sascha Steinbiss Date: Sat, 3 Oct 2020 12:27:30 +0200 Subject: [PATCH] make sure hardening relevant flags are passed --- stenotype/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/stenotype/Makefile b/stenotype/Makefile index abe54aea..2a49e276 100644 --- a/stenotype/Makefile +++ b/stenotype/Makefile @@ -56,12 +56,12 @@ FUZZ_FILES=util index index_bin SANITIZE= ifndef SANITIZE OBJECTS=$(foreach file,$(FILES),$(file)_opt.o) - CFLAGS=$(SHARED_CFLAGS) $(OPT_CFLAGS) - LDFLAGS=$(SHARED_LDFLAGS) $(OPT_LDFLAGS) + CFLAGS:=$(CFLAGS) $(SHARED_CFLAGS) $(OPT_CFLAGS) + LDFLAGS:=$(LDFLAGS) $(SHARED_LDFLAGS) $(OPT_LDFLAGS) else OBJECTS=$(foreach file,$(FILES),$(file)_$(SANITIZE)_dbg.o) - CFLAGS=$(SHARED_CFLAGS) $(DBG_CFLAGS) -fsanitize=$(SANITIZE) - LDFLAGS=$(SHARED_LDFLAGS) $(DBG_LDFLAGS) + CFLAGS:=$(CFLAGS) $(SHARED_CFLAGS) $(DBG_CFLAGS) -fsanitize=$(SANITIZE) + LDFLAGS:=$(LDFLAGS) $(SHARED_LDFLAGS) $(DBG_LDFLAGS) CXX=clang++ # Force clang if we're sanitizing endif ifeq "$(SANITIZE)" "memory" @@ -78,15 +78,15 @@ clean: # Generate g++ object files. %_opt.o: %.cc $(DEPS) - $(CXX) $(CFLAGS) -c -o $@ $< + $(CXX) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< # Generate clang object files. %_$(SANITIZE)_dbg.o: %.cc $(DEPS) - $(CXX) $(CFLAGS) -c -o $@ $< + $(CXX) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< # Generate the stenotype binary itself. You mostly want this :) stenotype: $(OBJECTS) - $(CXX) $(CFLAGS) -o $@ $^ $(LDFLAGS) + $(CXX) $(CFLAGS) $(CPPFLAGS) -o $@ $^ $(LDFLAGS)