summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-03-11 07:16:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-11 07:16:25 (GMT)
commit1de413bc1db8fb1d2269dd951269e798cf9a17fa (patch)
tree833aa084d342918dd60d69b3e828e9a8675f7467
parent2274fc75c33a8a1a551899e78e7746f311470d6f (diff)
parentf23aa18e7fef59f9187a733e752dc425aa5346bf (diff)
downloadgit-1de413bc1db8fb1d2269dd951269e798cf9a17fa.zip
git-1de413bc1db8fb1d2269dd951269e798cf9a17fa.tar.gz
git-1de413bc1db8fb1d2269dd951269e798cf9a17fa.tar.bz2
Merge branch 'rj/hdr-check-gcrypt-fix'
The set of header files used by "make hdr-check" unconditionally included sha256/gcrypt.h, even when it is not used, causing the make target to fail. We now skip it when GCRYPT_SHA256 is not in use. * rj/hdr-check-gcrypt-fix: Makefile: fix 'hdr-check' when GCRYPT not installed
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1486683..acd6791 100644
--- a/Makefile
+++ b/Makefile
@@ -2749,7 +2749,10 @@ $(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE
sparse: $(SP_OBJ)
GEN_HDRS := command-list.h unicode-width.h
-EXCEPT_HDRS := $(GEN_HDRS) compat% xdiff%
+EXCEPT_HDRS := $(GEN_HDRS) compat/% xdiff/%
+ifndef GCRYPT_SHA256
+ EXCEPT_HDRS += sha256/gcrypt.h
+endif
CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(patsubst ./%,%,$(LIB_H)))
HCO = $(patsubst %.h,%.hco,$(CHK_HDRS))