diff options
| author |   Mickaël Salaün <mic@digikod.net> | 2018-01-26 01:39:30 +0100 |
|---|---|---|
| committer |   Daniel Borkmann <daniel@iogearbox.net> | 2018-01-26 23:57:10 +0100 |
| commit | c25ef6a5e62fa212d298ce24995ce239f29b5f96 (patch) | |
| tree | e2154d9a6f0dd70ea7f77a80dfe5b98df6b34d6c /samples | |
| parent | bpf: clean up from test_tcpbpf_kern.c (diff) | |
| download | linux-dev-c25ef6a5e62fa212d298ce24995ce239f29b5f96.tar.xz linux-dev-c25ef6a5e62fa212d298ce24995ce239f29b5f96.zip | |
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: Mickaël Salaün <mic@digikod.net>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/bpf/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 7f61a3d57fa7..64335bb94f9f 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -201,13 +201,16 @@ CLANG_ARCH_ARGS = -target $(ARCH) endif # Trick to allow make to be run from this directory -all: +all: $(LIBBPF) $(MAKE) -C ../../ $(CURDIR)/ clean: $(MAKE) -C ../../ M=$(CURDIR) clean @rm -f *~ +$(LIBBPF): FORCE + $(MAKE) -C $(dir $@) $(notdir $@) + $(obj)/syscall_nrs.s: $(src)/syscall_nrs.c $(call if_changed_dep,cc_s_c) |