jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

fix merge conflict on master (#1217)

This commit is contained in:
Paul Dreik 2020-10-07 10:05:31 +02:00 committed by GitHub
parent a9480a768b
commit 1f98e64b71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fuzz/build_fuzzer_variants.sh
View File

@ -45,12 +45,7 @@ variant=sanitizers
-DCMAKE_C_FLAGS="-fsanitize=fuzzer-no-link,address,undefined -fno-sanitize-recover=undefined" \
-DCMAKE_BUILD_TYPE=Debug \
-DSIMDJSON_FUZZ_LINKMAIN=Off \
<<<<<<< HEAD
-DSIMDJSON_FUZZ_LDFLAGS="-fsanitize=fuzzer"
=======
-DSIMDJSON_FUZZ_LDFLAGS=$LIB_FUZZING_ENGINE \
-DSIMDJSON_EXCLUDE_IMPLEMENTATION=haswell
>>>>>>> Kinder, gentler implementation selection
ninja all_fuzzers
cd ..