Commit c25ef6a5 authored by Mickaël Salaün's avatar Mickaël Salaün Committed by Daniel Borkmann

samples/bpf: Partially fixes the bpf.o build

Do not build lib/bpf/bpf.o with this Makefile but use the one from the
library directory.  This avoid making a buggy bpf.o file (e.g. missing
symbols).

This patch is useful if some code (e.g. Landlock tests) needs both the
bpf.o (from tools/lib/bpf) and the bpf_load.o (from samples/bpf).
Signed-off-by: default avatarMickaël Salaün <mic@digikod.net>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 771fc607
...@@ -201,13 +201,16 @@ CLANG_ARCH_ARGS = -target $(ARCH) ...@@ -201,13 +201,16 @@ CLANG_ARCH_ARGS = -target $(ARCH)
endif endif
# Trick to allow make to be run from this directory # Trick to allow make to be run from this directory
all: all: $(LIBBPF)
$(MAKE) -C ../../ $(CURDIR)/ $(MAKE) -C ../../ $(CURDIR)/
clean: clean:
$(MAKE) -C ../../ M=$(CURDIR) clean $(MAKE) -C ../../ M=$(CURDIR) clean
@rm -f *~ @rm -f *~
$(LIBBPF): FORCE
$(MAKE) -C $(dir $@) $(notdir $@)
$(obj)/syscall_nrs.s: $(src)/syscall_nrs.c $(obj)/syscall_nrs.s: $(src)/syscall_nrs.c
$(call if_changed_dep,cc_s_c) $(call if_changed_dep,cc_s_c)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment