diff options
| author | Andrii Nakryiko <andrii@kernel.org> | 2021-12-02 02:28:22 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2021-12-03 02:23:40 +0300 |
| commit | 527024f7aeb683ce7ef49b07ef7ce9ecf015288d (patch) | |
| tree | 0f5dfede9d448a1c72e77afdc284f4052e7f9df6 /samples/bpf/Makefile.target | |
| parent | 186d1a86003ddcf0ec9e85e17ece868663106639 (diff) | |
| download | linux-527024f7aeb683ce7ef49b07ef7ce9ecf015288d.tar.xz | |
samples/bpf: Clean up samples/bpf build failes
Remove xdp_samples_user.o rule redefinition which generates Makefile
warning and instead override TPROGS_CFLAGS. This seems to work fine when
building inside selftests/bpf.
That was one big head-scratcher before I found that generic
Makefile.target hid this surprising specialization for for xdp_samples_user.o.
Main change is to use actual locally installed libbpf headers.
Also drop printk macro re-definition (not even used!).
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20211201232824.3166325-8-andrii@kernel.org
Diffstat (limited to 'samples/bpf/Makefile.target')
| -rw-r--r-- | samples/bpf/Makefile.target | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/samples/bpf/Makefile.target b/samples/bpf/Makefile.target index 5a368affa038..7621f55e2947 100644 --- a/samples/bpf/Makefile.target +++ b/samples/bpf/Makefile.target @@ -73,14 +73,3 @@ quiet_cmd_tprog-cobjs = CC $@ cmd_tprog-cobjs = $(CC) $(tprogc_flags) -c -o $@ $< $(tprog-cobjs): $(obj)/%.o: $(src)/%.c FORCE $(call if_changed_dep,tprog-cobjs) - -# Override includes for xdp_sample_user.o because $(srctree)/usr/include in -# TPROGS_CFLAGS causes conflicts -XDP_SAMPLE_CFLAGS += -Wall -O2 -lm \ - -I./tools/include \ - -I./tools/include/uapi \ - -I./tools/lib \ - -I./tools/testing/selftests/bpf -$(obj)/xdp_sample_user.o: $(src)/xdp_sample_user.c \ - $(src)/xdp_sample_user.h $(src)/xdp_sample_shared.h - $(CC) $(XDP_SAMPLE_CFLAGS) -c -o $@ $< |