Skip to content

Commit

Permalink
Fix make test failing when repo built from tarball
Browse files Browse the repository at this point in the history
Compilation flag -D_FORTIFY_SOURCE causes TieredMemDB tarballs
to be generated with faults. Tests `make test` fail because of
redis-benchmark not being generated.
This change fixes that issue.
  • Loading branch information
PatKamin committed Sep 28, 2022
1 parent 2551005 commit 5095aee
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,7 @@ WARN=-Wall -W -Wno-missing-field-initializers -Wformat -Wformat-security
OPT=$(OPTIMIZATION)
SECURITY_PIC=-fPIE -fPIC
SECURITY_NO_EXEC=-Wl,-z,relro,-z,now,-z,noexecstack
SECURITY_FORTIFY_SOURCE=""
ifneq ($(OPTIMIZATION),-O0)
# the -D_FORTIFY_SOURCE flag only works with optimization enabled
SECURITY_FORTIFY_SOURCE="-D_FORTIFY_SOURCE=2"
else
$(warning Optimization is required to set _FORTIFY_SOURCE)
endif
SECURITY_FLAGS=$(SECURITY_PIC) $(SECURITY_NO_EXEC) $(SECURITY_FORTIFY_SOURCE)
SECURITY_FLAGS=$(SECURITY_PIC) $(SECURITY_NO_EXEC)

PREFIX?=/usr/local
INSTALL_BIN=$(PREFIX)/bin
Expand Down

0 comments on commit 5095aee

Please sign in to comment.