From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Nov 2018 09:23:58 +0000 (+0900)
Subject: Merge branch 'js/fuzz-cxxflags'
X-Git-Tag: v2.20.0-rc0~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7b9bb3876d3be45c48b646043c384b64133f195a?hp=b8a920919348bc6d6cdf27c2fd4f7ae5078869d8

Merge branch 'js/fuzz-cxxflags'

The build procedure to link for fuzzing test has been made
customizable with a new Makefile variable.

* js/fuzz-cxxflags:
Makefile: use FUZZ_CXXFLAGS for linking fuzzers
---

diff --git a/Makefile b/Makefile
index 827e963378..b8d5f1a27f 100644
--- a/Makefile
+++ b/Makefile
@@ -3099,14 +3099,16 @@ cover_db_html: cover_db
 # An example command to build against libFuzzer from LLVM 4.0.0:
 #
 # make CC=clang CXX=clang++ \
-#      CFLAGS="-fsanitize-coverage=trace-pc-guard -fsanitize=address" \
+#      FUZZ_CXXFLAGS="-fsanitize-coverage=trace-pc-guard -fsanitize=address" \
 #      LIB_FUZZING_ENGINE=/usr/lib/llvm-4.0/lib/libFuzzer.a \
 #      fuzz-all
 #
+FUZZ_CXXFLAGS ?= $(CFLAGS)
+
 .PHONY: fuzz-all
 
 $(FUZZ_PROGRAMS): all
-	$(QUIET_LINK)$(CXX) $(CFLAGS) $(LIB_OBJS) $(BUILTIN_OBJS) \
+	$(QUIET_LINK)$(CXX) $(FUZZ_CXXFLAGS) $(LIB_OBJS) $(BUILTIN_OBJS) \
 		$(XDIFF_OBJS) $(EXTLIBS) git.o $@.o $(LIB_FUZZING_ENGINE) -o $@
 
 fuzz-all: $(FUZZ_PROGRAMS)