aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2021-02-11 13:40:04 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-10 13:36:10 +0200
commit76983e24490855aa3bfa0a5dfdb74995d5628b73 (patch)
treeaa335877cf2c886fc663be8137b7471450e2508c /Makefile
parent0945d67e5d43be9b1b130d8893dce4f2a8f589dd (diff)
downloadkernel_replicant_linux-76983e24490855aa3bfa0a5dfdb74995d5628b73.tar.gz
kernel_replicant_linux-76983e24490855aa3bfa0a5dfdb74995d5628b73.tar.bz2
kernel_replicant_linux-76983e24490855aa3bfa0a5dfdb74995d5628b73.zip
kbuild: Do not clean resolve_btfids if the output does not exist
[ Upstream commit 0e1aa629f1ce9e8cb89e0cefb9e3bfb3dfa94821 ] 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. Adding check around the resolve_btfids clean target to ensure the output directory is in place. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Tested-by: Nathan Chancellor <nathan@kernel.org> Link: https://lore.kernel.org/bpf/20210211124004.1144344-1-jolsa@kernel.org Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3a3937ab7ed0..4420131d4709 100644
--- a/Makefile
+++ b/Makefile
@@ -1085,8 +1085,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