diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-07-12 11:55:58 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2022-07-12 19:40:43 +0200 |
| commit | 30f96ad51bbc90d63411a407853bfc132f27ccc2 (patch) | |
| tree | 4628afc521403a4e802d4b129fa72c97c6b9e765 /fuzz | |
| parent | b4cb14ec1922b16a52c24324792f2bd7819f04a7 (diff) | |
Do not interfere with CFLAGS/LDFLAGS env anymore.improved/c-ld-flags-copts
* CI fixes
* some build systems do not like that (e.g. OpenWrt)
* fixed some rrdtool related build warnings/errors
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'fuzz')
| -rw-r--r-- | fuzz/Makefile.am | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am index dc149968a..ed680892b 100644 --- a/fuzz/Makefile.am +++ b/fuzz/Makefile.am @@ -10,8 +10,8 @@ fuzz_process_packet_LDFLAGS += $(LIB_FUZZING_ENGINE) endif # force usage of CXX for linker fuzz_process_packet_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(fuzz_process_packet_LDFLAGS) $(LDFLAGS) -o $@ + $(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(fuzz_process_packet_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@ fuzz_process_packet_with_main_SOURCES = fuzz_process_packet.c fuzz_process_packet_with_main_CFLAGS = -DBUILD_MAIN @@ -19,8 +19,8 @@ fuzz_process_packet_with_main_LDADD = ../src/lib/libndpi.a fuzz_process_packet_with_main_LDFLAGS = $(ADDITIONAL_LIBS) $(LIBS) # force usage of CXX for linker fuzz_process_packet_with_main_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(fuzz_process_packet_with_main_LDFLAGS) $(LDFLAGS) -o $@ + $(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(fuzz_process_packet_with_main_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@ fuzz_ndpi_reader_SOURCES = fuzz_ndpi_reader.c fuzz_ndpi_reader_CFLAGS = -I../example/ @@ -32,8 +32,8 @@ fuzz_ndpi_reader_LDFLAGS += $(LIB_FUZZING_ENGINE) endif # force usage of CXX for linker fuzz_ndpi_reader_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(fuzz_ndpi_reader_LDFLAGS) $(LDFLAGS) -o $@ + $(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(fuzz_ndpi_reader_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@ fuzz_ndpi_reader_with_main_SOURCES = fuzz_ndpi_reader.c fuzz_ndpi_reader_with_main_CFLAGS = -I../example/ -DBUILD_MAIN @@ -41,8 +41,8 @@ fuzz_ndpi_reader_with_main_LDADD = ../src/lib/libndpi.a fuzz_ndpi_reader_with_main_LDFLAGS = ../example/libndpiReader.a $(PCAP_LIB) $(ADDITIONAL_LIBS) $(LIBS) # force usage of CXX for linker fuzz_ndpi_reader_with_main_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(fuzz_ndpi_reader_with_main_LDFLAGS) $(LDFLAGS) -o $@ + $(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(fuzz_ndpi_reader_with_main_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@ # required for Google oss-fuzz # see https://github.com/google/oss-fuzz/tree/master/projects/ndpi |