summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorYossi Gottlieb <yossigo@gmail.com>2020-09-01 10:02:14 +0300
committerGitHub <noreply@github.com>2020-09-01 10:02:14 +0300
commitb35d6e5cffb895ab6cbbd9e5e56ef00299b1359e (patch)
tree9f7480ccc0ba948148c09fe94bc67782ec47cf05 /src/Makefile
parentd75ad774a92bd7de0b9448be3d622d7a13b7af27 (diff)
downloadredis-b35d6e5cffb895ab6cbbd9e5e56ef00299b1359e.tar.gz
Fix double-make issue with make && make install. (#7734)
All user-supplied variables that affect the build should be explicitly persisted. Fixes #7254
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index 9ea4b654f..9ff344c6a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -255,6 +255,8 @@ persist-settings: distclean
echo WARN=$(WARN) >> .make-settings
echo OPT=$(OPT) >> .make-settings
echo MALLOC=$(MALLOC) >> .make-settings
+ echo BUILD_TLS=$(BUILD_TLS) >> .make-settings
+ echo USE_SYSTEMD=$(USE_SYSTEMD) >> .make-settings
echo CFLAGS=$(CFLAGS) >> .make-settings
echo LDFLAGS=$(LDFLAGS) >> .make-settings
echo REDIS_CFLAGS=$(REDIS_CFLAGS) >> .make-settings