Reorder include paths to ensure that runqslower sources are picking up vmlinux.h, generated by runqslower's own Makefile. When runqslower is built from selftests/bpf, due to current -I$(BPF_INCLUDE) -I$(OUTPUT) ordering, it might pick up not-yet-complete vmlinux.h, generated by selftests Makefile, which could lead to compilation errors like [0]. So ensure that -I$(OUTPUT) goes first and rely on runqslower's Makefile own dependency chain to ensure vmlinux.h is properly completed before source code relying on it is compiled. [0] https://travis-ci.org/github/libbpf/libbpf/jobs/677905925
Unified · Split
| @@ -8,7 +8,7 @@ BPFTOOL ?= $(DEFAULT_BPFTOOL) · 7 unmodified lines | ||
| 8 | 8 | LIBBPF_SRC := $(abspath ../../lib/bpf) |
| 9 | 9 | BPFOBJ := $(OUTPUT)/libbpf.a |
| 10 | 10 | BPF_INCLUDE := $(OUTPUT) |
| 11 | −INCLUDES := -I$(BPF_INCLUDE) -I$(OUTPUT) -I$(abspath ../../lib) | |
| 11 | +INCLUDES := -I$(OUTPUT) -I$(BPF_INCLUDE) -I$(abspath ../../lib) | |
| 12 | 12 | CFLAGS := -g -Wall |
| 13 | 13 | |
| 14 | 14 | # Try to detect best kernel BTF source |