Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

samples/bpf: Partially fixes the bpf.o build

Browse source 
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>
This commit is contained in:
Mickaël Salaün 2018-01-26 01:39:30 +01:00 • committed by Daniel Borkmann
parent 771fc607e6
commit c25ef6a5e6
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
samples/bpf/Makefile
View file

@ -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)