From 6655625c30baf7100514c2f008512e72bae8f861 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Wed, 14 Sep 2022 15:49:32 +0200 Subject: [PATCH] Makefile: Include seccomp.h in HEADERS and require it for static checkers Targets running static checkers (cppcheck and clang-tidy) need seccomp.h, but the latter is not included in HEADERS. Add it. Signed-off-by: Stefano Brivio Reviewed-by: David Gibson --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6805c23..c47a5f6 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ MANPAGES = passt.1 pasta.1 qrap.1 PASST_HEADERS = arch.h arp.h checksum.h conf.h dhcp.h dhcpv6.h icmp.h \ isolation.h lineread.h ndp.h netlink.h packet.h passt.h pasta.h \ pcap.h siphash.h tap.h tcp.h tcp_splice.h udp.h util.h -HEADERS = $(PASST_HEADERS) +HEADERS = $(PASST_HEADERS) seccomp.h # On gcc 11.2, with -O2 and -flto, tcp_hash() and siphash_20b(), if inlined, # seem to be hitting something similar to: @@ -104,11 +104,11 @@ static: clean all seccomp.h: $(PASST_SRCS) $(PASST_HEADERS) @ EXTRA_SYSCALLS=$(EXTRA_SYSCALLS) ./seccomp.sh $^ -passt: $(PASST_SRCS) $(PASST_HEADERS) seccomp.h +passt: $(PASST_SRCS) $(HEADERS) $(CC) $(FLAGS) $(CFLAGS) $(PASST_SRCS) -o passt $(LDFLAGS) passt.avx2: FLAGS += -Ofast -mavx2 -ftree-vectorize -funroll-loops -passt.avx2: $(PASST_SRCS) $(PASST_HEADERS) seccomp.h +passt.avx2: $(PASST_SRCS) $(HEADERS) $(CC) $(filter-out -O2,$(FLAGS) $(CFLAGS)) \ $(PASST_SRCS) -o passt.avx2 $(LDFLAGS)