From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Apr 2024 21:49:44 +0000 (-0700)
Subject: Merge branch 'js/build-fuzz-more-often'
X-Git-Tag: v2.46.0-rc0~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=473dcb4d89494a826b84a21f5dd4220cf79cb331;p=thirdparty%2Fgit.git

Merge branch 'js/build-fuzz-more-often'

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
---

473dcb4d89494a826b84a21f5dd4220cf79cb331
diff --cc config.mak.uname
index a7607a5676,9107b4ae2b..85d63821ec
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -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