From aa9612d35f59f7f269fba4797c8da491844c56ec Mon Sep 17 00:00:00 2001 From: Garret Rieger Date: Mon, 12 Mar 2018 18:04:34 -0700 Subject: [PATCH] [subset] Fix fuzzing build for hb-subset-fuzzer. --- src/Makefile.am | 19 +++---------------- test/fuzzing/Makefile.am | 1 + 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4d1f237db..d99478802 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -184,7 +184,8 @@ FUZZING_CPPFLAGS = \ -DHB_BUFFER_MAX_OPS_MIN=64 \ -DHB_BUFFER_MAX_OPS_DEFAULT=1024 \ $(NULL) -EXTRA_LTLIBRARIES = libharfbuzz-fuzzing.la +EXTRA_LTLIBRARIES = libharfbuzz-fuzzing.la libharfbuzz-subset-fuzzing.la + libharfbuzz_fuzzing_la_LINK = $(chosen_linker) $(libharfbuzz_fuzzing_la_LDFLAGS) libharfbuzz_fuzzing_la_SOURCES = $(libharfbuzz_la_SOURCES) libharfbuzz_fuzzing_la_CPPFLAGS = $(HBCFLAGS) $(FUZZING_CPPFLAGS) @@ -193,23 +194,9 @@ libharfbuzz_fuzzing_la_LIBADD = $(libharfbuzz_la_LIBADD) EXTRA_libharfbuzz_fuzzing_la_DEPENDENCIES = $(EXTRA_libharfbuzz_la_DEPENDENCIES) CLEANFILES += libharfbuzz-fuzzing.la -SUBSET_FUZZING_CPPFLAGS = \ - -DHB_NDEBUG \ - -DHB_MAX_NESTING_LEVEL=3 \ - -DHB_SANITIZE_MAX_EDITS=3 \ - -DHB_SANITIZE_MAX_OPS_FACTOR=3 \ - -DHB_SANITIZE_MAX_OPS_MIN=128 \ - -DHB_BUFFER_MAX_LEN_FACTOR=3 \ - -DHB_BUFFER_MAX_LEN_MIN=8 \ - -DHB_BUFFER_MAX_LEN_DEFAULT=128 \ - -DHB_BUFFER_MAX_OPS_FACTOR=8 \ - -DHB_BUFFER_MAX_OPS_MIN=64 \ - -DHB_BUFFER_MAX_OPS_DEFAULT=1024 \ - $(NULL) -EXTRA_LTLIBRARIES = libharfbuzz-subset-fuzzing.la libharfbuzz_subset_fuzzing_la_LINK = $(chosen_linker) $(libharfbuzz_subset_fuzzing_la_LDFLAGS) libharfbuzz_subset_fuzzing_la_SOURCES = $(libharfbuzz_subset_la_SOURCES) -libharfbuzz_subset_fuzzing_la_CPPFLAGS = $(HBCFLAGS) $(SUBSET_FUZZING_CPPFLAGS) +libharfbuzz_subset_fuzzing_la_CPPFLAGS = $(HBCFLAGS) $(FUZZING_CPPFLAGS) libharfbuzz_subset_fuzzing_la_LDFLAGS = $(AM_LDFLAGS) libharfbuzz_subset_fuzzing_la_LIBADD = $(libharfbuzz_subset_la_LIBADD) EXTRA_libharfbuzz_subset_fuzzing_la_DEPENDENCIES = $(EXTRA_libharfbuzz_subset_la_DEPENDENCIES) diff --git a/test/fuzzing/Makefile.am b/test/fuzzing/Makefile.am index 638f2f0d6..27f59d9d7 100644 --- a/test/fuzzing/Makefile.am +++ b/test/fuzzing/Makefile.am @@ -50,6 +50,7 @@ hb_fuzzer_DEPENDENCIES = \ hb_subset_fuzzer_SOURCES = \ hb-subset.hh \ hb-subset-fuzzer.cc \ + main.cc \ $(NULL) hb_subset_fuzzer_LDADD = \ $(top_builddir)/src/libharfbuzz-subset-fuzzing.la \