--- a/contrib/fuzz/Makefile Fri Dec 06 15:08:37 2019 -0500
+++ b/contrib/fuzz/Makefile Fri Dec 06 15:21:45 2019 -0500
@@ -23,15 +23,6 @@
`$(PYTHON_CONFIG) --cflags` \
-I../../mercurial -c -o pyutil.o pyutil.cc
-bdiff.o: ../../mercurial/bdiff.c
- $(CC) $(CFLAGS) -fsanitize=fuzzer-no-link,address -c -o bdiff.o \
- ../../mercurial/bdiff.c
-
-bdiff: bdiff.cc bdiff.o
- $(CXX) $(CXXFLAGS) -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \
- -std=c++17 \
- -I../../mercurial bdiff.cc bdiff.o -o bdiff
-
bdiff-oss-fuzz.o: ../../mercurial/bdiff.c
$(CC) $(CFLAGS) -c -o bdiff-oss-fuzz.o ../../mercurial/bdiff.c
@@ -44,11 +35,6 @@
$(CC) -g -O1 -fsanitize=fuzzer-no-link,address -c -o mpatch.o \
../../mercurial/mpatch.c
-mpatch: CXXFLAGS += -std=c++17
-mpatch: mpatch.cc mpatch.o
- $(CXX) $(CXXFLAGS) -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \
- -I../../mercurial mpatch.cc mpatch.o -o mpatch
-
mpatch-oss-fuzz.o: ../../mercurial/mpatch.c
$(CC) $(CFLAGS) -c -o mpatch-oss-fuzz.o ../../mercurial/mpatch.c
@@ -60,17 +46,6 @@
mpatch_corpus.zip:
python mpatch_corpus.py $$OUT/mpatch_fuzzer_seed_corpus.zip
-x%.o: ../../mercurial/thirdparty/xdiff/x%.c ../../mercurial/thirdparty/xdiff/*.h
- $(CC) -g -O1 -fsanitize=fuzzer-no-link,address -c \
- -o $@ \
- $<
-
-xdiff: CXXFLAGS += -std=c++17
-xdiff: xdiff.cc xdiffi.o xprepare.o xutils.o
- $(CXX) $(CXXFLAGS) -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \
- -I../../mercurial xdiff.cc \
- xdiffi.o xprepare.o xutils.o -o xdiff
-
fuzz-x%.o: ../../mercurial/thirdparty/xdiff/x%.c ../../mercurial/thirdparty/xdiff/*.h
$(CC) $(CFLAGS) -c \
-o $@ \