Merge branch 'bug22105_031' into maint-0.3.1

This commit is contained in:
Nick Mathewson 2017-06-26 14:30:17 -04:00
commit 32596016a2

View File

@ -36,7 +36,7 @@ oss-fuzz-prereqs: \
noinst_HEADERS += \ noinst_HEADERS += \
src/test/fuzz/fuzzing.h src/test/fuzz/fuzzing.h
LIBFUZZER = /home/nickm/build/libfuzz/libFuzzer.a LIBFUZZER = -lFuzzer
LIBFUZZER_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ LIBFUZZER_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ
LIBFUZZER_CFLAGS = $(FUZZING_CFLAGS) LIBFUZZER_CFLAGS = $(FUZZING_CFLAGS)
LIBFUZZER_LDFLAG = $(FUZZING_LDFLAG) LIBFUZZER_LDFLAG = $(FUZZING_LDFLAG)