# HG changeset patch # User Yuya Nishihara # Date 1527999082 -32400 # Node ID bf901559e64728a23cb1b366fc60073fbb141cac # Parent 7701c2d4a438693fd411fd1158c55401280cf337 fuzz: expand variables by make Otherwise it wouldn't work unless CC and CXX were exported from the environment. diff -r 7701c2d4a438 -r bf901559e647 contrib/fuzz/Makefile --- a/contrib/fuzz/Makefile Sat Apr 21 17:21:31 2018 +0900 +++ b/contrib/fuzz/Makefile Sun Jun 03 13:11:22 2018 +0900 @@ -1,46 +1,49 @@ +CC = clang +CXX = clang++ + fuzzutil.o: fuzzutil.cc fuzzutil.h - $$CXX $$CXXFLAGS -g -O1 -fsanitize=fuzzer-no-link,address \ + $(CXX) $(CXXFLAGS) -g -O1 -fsanitize=fuzzer-no-link,address \ -std=c++17 \ -I../../mercurial -c -o fuzzutil.o fuzzutil.cc fuzzutil-oss-fuzz.o: fuzzutil.cc fuzzutil.h - $$CXX $$CXXFLAGS -std=c++17 \ + $(CXX) $(CXXFLAGS) -std=c++17 \ -I../../mercurial -c -o fuzzutil-oss-fuzz.o fuzzutil.cc bdiff.o: ../../mercurial/bdiff.c - $$CC $$CFLAGS -fsanitize=fuzzer-no-link,address -c -o bdiff.o \ + $(CC) $(CFLAGS) -fsanitize=fuzzer-no-link,address -c -o bdiff.o \ ../../mercurial/bdiff.c bdiff: bdiff.cc bdiff.o fuzzutil.o - $$CXX $$CXXFLAGS -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \ + $(CXX) $(CXXFLAGS) -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \ -std=c++17 \ -I../../mercurial bdiff.cc bdiff.o fuzzutil.o -o bdiff bdiff-oss-fuzz.o: ../../mercurial/bdiff.c - $$CC $$CFLAGS -c -o bdiff-oss-fuzz.o ../../mercurial/bdiff.c + $(CC) $(CFLAGS) -c -o bdiff-oss-fuzz.o ../../mercurial/bdiff.c bdiff_fuzzer: bdiff.cc bdiff-oss-fuzz.o fuzzutil-oss-fuzz.o - $$CXX $$CXXFLAGS -std=c++17 -I../../mercurial bdiff.cc \ + $(CXX) $(CXXFLAGS) -std=c++17 -I../../mercurial bdiff.cc \ bdiff-oss-fuzz.o fuzzutil-oss-fuzz.o -lFuzzingEngine -o \ $$OUT/bdiff_fuzzer x%.o: ../../mercurial/thirdparty/xdiff/x%.c ../../mercurial/thirdparty/xdiff/*.h - $$CC -g -O1 -fsanitize=fuzzer-no-link,address -c \ + $(CC) -g -O1 -fsanitize=fuzzer-no-link,address -c \ -o $@ \ $< xdiff: xdiff.cc xdiffi.o xprepare.o xutils.o fuzzutil.o - $$CXX $$CXXFLAGS -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \ + $(CXX) $(CXXFLAGS) -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \ -I../../mercurial xdiff.cc \ xdiffi.o xprepare.o xutils.o fuzzutil.o -o xdiff fuzz-x%.o: ../../mercurial/thirdparty/xdiff/x%.c ../../mercurial/thirdparty/xdiff/*.h - $$CC $$CFLAGS -c \ + $(CC) $(CFLAGS) -c \ -o $@ \ $< xdiff_fuzzer: xdiff.cc fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o fuzzutil-oss-fuzz.o - $$CXX $$CXXFLAGS -std=c++17 -I../../mercurial xdiff.cc \ + $(CXX) $(CXXFLAGS) -std=c++17 -I../../mercurial xdiff.cc \ fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o fuzzutil-oss-fuzz.o \ -lFuzzingEngine -o $$OUT/xdiff_fuzzer