[PATCH] tools/resolve_btfids: Include libsubcmd headers directly from source tree

[PATCH] tools/resolve_btfids: Include libsubcmd headers directly from source tree

[Thomas Weißschuh]

Currently each build with resolve_btfids enabled unnecessarily prints
the line 'INSTALL libsubcmd_headers' from libsubcmd.

Use the libcmd headers from source tree instead, without installation.

The same was done for objtool in commit ac999926774a ("objtool: Include
libsubcmd headers directly from source tree"), albeit for a different
reason.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
Changes in v2:
- Rebase on v7.2-rc1.
- Change the resolve_btfids rules instead of the libsubcmd ones
- Link to v1: https://lore.kernel.org/lkml/20260303-libsubcmd-spam-v1-1-d0749e3c7998@linutronix.de/
---
 tools/bpf/resolve_btfids/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile
index 7672208f65e4..bb0463b380af 100644
--- a/tools/bpf/resolve_btfids/Makefile
+++ b/tools/bpf/resolve_btfids/Makefile
@@ -40,7 +40,6 @@ LIBBPF_DESTDIR := $(LIBBPF_OUT)
 LIBBPF_INCLUDE := $(LIBBPF_DESTDIR)include
 
 SUBCMD_DESTDIR := $(SUBCMD_OUT)
-SUBCMD_INCLUDE := $(SUBCMD_DESTDIR)include
 
 BINARY     := $(OUTPUT)/resolve_btfids
 BINARY_IN  := $(BINARY)-in.o
@@ -56,7 +55,7 @@ $(OUTPUT) $(OUTPUT)/libsubcmd $(LIBBPF_OUT):
 $(SUBCMDOBJ): fixdep FORCE | $(OUTPUT)/libsubcmd
 	$(Q)$(MAKE) -C $(SUBCMD_SRC) OUTPUT=$(SUBCMD_OUT) \
 		    DESTDIR=$(SUBCMD_DESTDIR) $(HOST_OVERRIDES) prefix= subdir= \
-		    $(abspath $@) install_headers
+		    $(abspath $@)
 
 $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OUT)
 	$(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) OUTPUT=$(LIBBPF_OUT)    \
@@ -77,7 +76,7 @@ HOSTCFLAGS_resolve_btfids += -g \
           -I$(srctree)/tools/include \
           -I$(srctree)/tools/include/uapi \
           -I$(LIBBPF_INCLUDE) \
-          -I$(SUBCMD_INCLUDE) \
+          -I$(srctree)/tools/lib \
           $(LIBELF_FLAGS) \
           -Wall -Werror
 

---
base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482
change-id: 20260213-libsubcmd-spam-1f52f0d0c579

Best regards,
--  
Thomas Weißschuh <thomas.weissschuh@linutronix.de>

Re: [PATCH] tools/resolve_btfids: Include libsubcmd headers directly from source tree

[Ihor Solodrai]

On 2026-07-02 1:26 a.m., Thomas WeiÃschuh wrote:
> Currently each build with resolve_btfids enabled unnecessarily prints
> the line 'INSTALL libsubcmd_headers' from libsubcmd.
> 
> Use the libcmd headers from source tree instead, without installation.
> 
> The same was done for objtool in commit ac999926774a ("objtool: Include
> libsubcmd headers directly from source tree"), albeit for a different
> reason.
> 
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>

LGTM, thanks!

Tested-by: Ihor Solodrai <ihor.solodrai@linux.dev>

> ---
> Changes in v2:
> - Rebase on v7.2-rc1.
> - Change the resolve_btfids rules instead of the libsubcmd ones
> - Link to v1: https://lore.kernel.org/lkml/20260303-libsubcmd-spam-v1-1-d0749e3c7998@linutronix.de/
> ---
>   tools/bpf/resolve_btfids/Makefile | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile
> index 7672208f65e4..bb0463b380af 100644
> --- a/tools/bpf/resolve_btfids/Makefile
> +++ b/tools/bpf/resolve_btfids/Makefile
> @@ -40,7 +40,6 @@ LIBBPF_DESTDIR := $(LIBBPF_OUT)
>   LIBBPF_INCLUDE := $(LIBBPF_DESTDIR)include
>   
>   SUBCMD_DESTDIR := $(SUBCMD_OUT)
> -SUBCMD_INCLUDE := $(SUBCMD_DESTDIR)include
>   
>   BINARY     := $(OUTPUT)/resolve_btfids
>   BINARY_IN  := $(BINARY)-in.o
> @@ -56,7 +55,7 @@ $(OUTPUT) $(OUTPUT)/libsubcmd $(LIBBPF_OUT):
>   $(SUBCMDOBJ): fixdep FORCE | $(OUTPUT)/libsubcmd
>   	$(Q)$(MAKE) -C $(SUBCMD_SRC) OUTPUT=$(SUBCMD_OUT) \
>   		    DESTDIR=$(SUBCMD_DESTDIR) $(HOST_OVERRIDES) prefix= subdir= \
> -		    $(abspath $@) install_headers
> +		    $(abspath $@)
>   
>   $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OUT)
>   	$(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) OUTPUT=$(LIBBPF_OUT)    \
> @@ -77,7 +76,7 @@ HOSTCFLAGS_resolve_btfids += -g \
>             -I$(srctree)/tools/include \
>             -I$(srctree)/tools/include/uapi \
>             -I$(LIBBPF_INCLUDE) \
> -          -I$(SUBCMD_INCLUDE) \
> +          -I$(srctree)/tools/lib \
>             $(LIBELF_FLAGS) \
>             -Wall -Werror
>   
> 
> ---
> base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482
> change-id: 20260213-libsubcmd-spam-1f52f0d0c579
> 
> Best regards,
> --
> Thomas Weißschuh <thomas.weissschuh@linutronix.de>
>