diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-11 10:16:25 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-11 10:16:25 +0300 |
| commit | 1de413bc1db8fb1d2269dd951269e798cf9a17fa (patch) | |
| tree | 833aa084d342918dd60d69b3e828e9a8675f7467 /Makefile | |
| parent | 2274fc75c33a8a1a551899e78e7746f311470d6f (diff) | |
| parent | f23aa18e7fef59f9187a733e752dc425aa5346bf (diff) | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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)) |