]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/build-fuzz-more-often'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Apr 2024 21:49:44 +0000 (14:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Apr 2024 21:49:44 +0000 (14:49 -0700)
In addition to building the objects needed, try to link the objects
that are used in fuzzer tests, to make sure at least they build
without bitrot, in Linux CI runs.

* js/build-fuzz-more-often:
  fuzz: link fuzz programs with `make all` on Linux

1  2 
Makefile
config.mak.uname

diff --cc Makefile
Simple merge
index a7607a567610a74bfae56214fc5787f063916ab3,9107b4ae2b778fd718b7f3cfb17bcc26a80f614e..85d63821ec95f65d78a726bae70abcb8c3845ab8
@@@ -65,9 -65,10 +65,10 @@@ ifeq ($(uname_S),Linux
        HAVE_PLATFORM_PROCINFO = YesPlease
        COMPAT_OBJS += compat/linux/procinfo.o
        # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7.
 -      ifneq ($(findstring .el7.,$(uname_R)),)
 +        ifneq ($(findstring .el7.,$(uname_R)),)
                BASIC_CFLAGS += -std=c99
 -      endif
 +        endif
+       LINK_FUZZ_PROGRAMS = YesPlease
  endif
  ifeq ($(uname_S),GNU/kFreeBSD)
        HAVE_ALLOCA_H = YesPlease