Skip to content
This repository was archived by the owner on Nov 4, 2022. It is now read-only.

make sure hardening relevant flags are passed #231

Open
satta wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make sure hardening relevant flags are passed #231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions stenotype/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)



Expand Down