Commit 795deb3f authored by Ilya Leoshkevich's avatar Ilya Leoshkevich Committed by Andrii Nakryiko
Browse files

selftests/bpf: Quote host tools 



Using HOSTCC="ccache clang" breaks building the tests, since, when it's
forwarded to e.g. bpftool, the child make sees HOSTCC=ccache and
"clang" is considered a target. Fix by quoting it, and also HOSTLD and
HOSTAR for consistency.

Signed-off-by: default avatarIlya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20230210001210.395194-2-iii@linux.ibm.com
parent 2531ba0e

tools/testing/selftests/bpf/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ BPFTOOL ?= $(DEFAULT_BPFTOOL) 
$(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile)    \

		    $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/bpftool

	$(Q)$(MAKE) $(submake_extras)  -C $(BPFTOOLDIR)			       \

		    ARCH= CROSS_COMPILE= CC=$(HOSTCC) LD=$(HOSTLD) 	       \

		    ARCH= CROSS_COMPILE= CC="$(HOSTCC)" LD="$(HOSTLD)" 	       \

		    EXTRA_CFLAGS='-g -O0'				       \

		    OUTPUT=$(HOST_BUILD_DIR)/bpftool/			       \

		    LIBBPF_OUTPUT=$(HOST_BUILD_DIR)/libbpf/		       \
@@ -280,7 +280,8 @@ $(HOST_BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ 
		| $(HOST_BUILD_DIR)/libbpf

	$(Q)$(MAKE) $(submake_extras) -C $(BPFDIR)                             \

		    EXTRA_CFLAGS='-g -O0' ARCH= CROSS_COMPILE=		       \

		    OUTPUT=$(HOST_BUILD_DIR)/libbpf/ CC=$(HOSTCC) LD=$(HOSTLD) \

		    OUTPUT=$(HOST_BUILD_DIR)/libbpf/			       \

		    CC="$(HOSTCC)" LD="$(HOSTLD)"			       \

		    DESTDIR=$(HOST_SCRATCH_DIR)/ prefix= all install_headers

endif
@@ -301,7 +302,7 @@ $(RESOLVE_BTFIDS): $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/resolve_btfids \ 
		       $(TOOLSDIR)/lib/ctype.c			\

		       $(TOOLSDIR)/lib/str_error_r.c

	$(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/resolve_btfids	\

		CC=$(HOSTCC) LD=$(HOSTLD) AR=$(HOSTAR) \

		CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" \

		LIBBPF_INCLUDE=$(HOST_INCLUDE_DIR) \

		OUTPUT=$(HOST_BUILD_DIR)/resolve_btfids/ BPFOBJ=$(HOST_BPFOBJ)