Message ID | 20210211124004.1144344-1-jolsa@kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [bpf-next] kbuild: Do not clean resolve_btfids if the output does not exist | expand |
Hello: This patch was applied to bpf/bpf-next.git (refs/heads/master): On Thu, 11 Feb 2021 13:40:04 +0100 you wrote: > Nathan reported issue with cleaning empty build directory: > > $ make -s O=build distclean > ../../scripts/Makefile.include:4: *** \ > O=/ho...build/tools/bpf/resolve_btfids does not exist. Stop. > > The problem that tools scripts require existing output > directory, otherwise it fails. > > [...] Here is the summary with links: - [bpf-next] kbuild: Do not clean resolve_btfids if the output does not exist https://git.kernel.org/bpf/bpf-next/c/0e1aa629f1ce You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/Makefile b/Makefile index 159d9592b587..b6fa039c18b8 100644 --- a/Makefile +++ b/Makefile @@ -1088,8 +1088,14 @@ endif PHONY += resolve_btfids_clean +resolve_btfids_O = $(abspath $(objtree))/tools/bpf/resolve_btfids + +# tools/bpf/resolve_btfids directory might not exist +# in output directory, skip its clean in that case resolve_btfids_clean: - $(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(abspath $(objtree))/tools/bpf/resolve_btfids clean +ifneq ($(wildcard $(resolve_btfids_O)),) + $(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean +endif ifdef CONFIG_BPF ifdef CONFIG_DEBUG_INFO_BTF