summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-03 13:26:38 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-03 13:26:38 -0400
commit2778032f4a0b65429c5279db003fd5b354115d1b (patch)
treef1f1357424dce2b097c58935229a9f8449373c3f
parent0fe7c42e0e8285b4b45e8dda4056f31f0c19fce2 (diff)
parentd0111264678704d0c2394a4ddd28621d3ef23d97 (diff)
downloadtor-2778032f4a0b65429c5279db003fd5b354115d1b.tar.gz
tor-2778032f4a0b65429c5279db003fd5b354115d1b.zip
Merge branch 'maint-0.3.1'
-rwxr-xr-xscripts/codegen/fuzzing_include_am.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py
index 91e9e5f3f6..6e45c21926 100755
--- a/scripts/codegen/fuzzing_include_am.py
+++ b/scripts/codegen/fuzzing_include_am.py
@@ -1,4 +1,4 @@
-
+#!/usr/bin/python
FUZZERS = """
consensus
@@ -33,7 +33,10 @@ FUZZING_LIBS = \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
@TOR_LIBEVENT_LIBS@ \
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
- @TOR_SYSTEMD_LIBS@
+ @TOR_SYSTEMD_LIBS@ \
+ @TOR_LZMA_LIBS@ \
+ @TOR_ZSTD_LIBS@ \
+ $(rust_ldadd)
oss-fuzz-prereqs: \
src/or/libtor-testing.a \
@@ -48,7 +51,7 @@ oss-fuzz-prereqs: \
noinst_HEADERS += \
src/test/fuzz/fuzzing.h
-LIBFUZZER = /home/nickm/build/libfuzz/libFuzzer.a
+LIBFUZZER = -lFuzzer
LIBFUZZER_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ
LIBFUZZER_CFLAGS = $(FUZZING_CFLAGS)
LIBFUZZER_LDFLAG = $(FUZZING_LDFLAG)