From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Oct 2019 02:33:02 +0000 (+0900)
Subject: Merge branch 'dl/honor-cflags-in-hdr-check'
X-Git-Tag: v2.24.0-rc0~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9728ab488ad2fc5e17daba69cbc80ff514f70da8;p=thirdparty%2Fgit.git

Merge branch 'dl/honor-cflags-in-hdr-check'

Dev support.

* dl/honor-cflags-in-hdr-check:
  ci: run `hdr-check` as part of the `Static Analysis` job
  Makefile: emulate compile in $(HCO) target better
  pack-bitmap.h: remove magic number
  promisor-remote.h: include missing header
  apply.h: include missing header
---

9728ab488ad2fc5e17daba69cbc80ff514f70da8
diff --cc Makefile
index 8c37e5412d,581cc617e3..d644527d37
--- a/Makefile
+++ b/Makefile
@@@ -2786,11 -2769,16 +2786,16 @@@ EXCEPT_HDRS := $(GEN_HDRS) compat/% xdi
  ifndef GCRYPT_SHA256
  	EXCEPT_HDRS += sha256/gcrypt.h
  endif
 -CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(patsubst ./%,%,$(LIB_H)))
 +CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(LIB_H))
  HCO = $(patsubst %.h,%.hco,$(CHK_HDRS))
+ HCC = $(HCO:hco=hcc)
  
- $(HCO): %.hco: %.h FORCE
- 	$(QUIET_HDR)$(CC) -include git-compat-util.h -I. -o /dev/null -c -xc $<
+ %.hcc: %.h
+ 	@echo '#include "git-compat-util.h"' >$@
+ 	@echo '#include "$<"' >>$@
+ 
+ $(HCO): %.hco: %.hcc FORCE
+ 	$(QUIET_HDR)$(CC) $(ALL_CFLAGS) -o /dev/null -c -xc $<
  
  .PHONY: hdr-check $(HCO)
  hdr-check: $(HCO)