]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dl/honor-cflags-in-hdr-check'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:33:02 +0000 (11:33 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:33:02 +0000 (11:33 +0900)
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

1  2 
.gitignore
Makefile
azure-pipelines.yml
ci/install-dependencies.sh
promisor-remote.h

diff --cc .gitignore
Simple merge
diff --cc Makefile
index 8c37e5412d992d8f21d8c7829ae9d051a10ce4ec,581cc617e37e2441e10e33afb88c96c75693cf72..d644527d37d91c70368a39a52fd0d267c5be76c2
+++ 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)
Simple merge
Simple merge
Simple merge