From 1126855911226e44fd7ba5f3b15df14cf4faf57f Mon Sep 17 00:00:00 2001 From: Huangbin Zhan Date: Thu, 18 Nov 2021 19:37:10 +0800 Subject: [PATCH] tools/llvm-bpf: make sure llvm-bpf.tar.gz is created The llvm-bpf-$version.tar.xz might be absent. For example `make clean` executed, CONFIG_TARGET changed. This commit can only guarantee that the target file can be built when tools/compile is explicitly called rather than $(tools/stamp-compile). Signed-off-by: Huangbin Zhan --- tools/llvm-bpf/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/llvm-bpf/Makefile b/tools/llvm-bpf/Makefile index a9fcc04495..4b4e67e201 100644 --- a/tools/llvm-bpf/Makefile +++ b/tools/llvm-bpf/Makefile @@ -41,21 +41,22 @@ CMAKE_HOST_OPTIONS += \ -DLLVM_TOOLCHAIN_TOOLS="llvm-objcopy;llvm-objdump;llvm-readelf;llvm-strip;llvm-ar;llvm-as;llvm-dis;llvm-link;llvm-nm;llvm-ranlib;llc;opt" \ -DCMAKE_SKIP_RPATH=OFF -ifneq ($(CONFIG_SDK_LLVM_BPF),) - define Host/Install/Bin +$(BIN_DIR)/llvm-bpf-$(PKG_VERSION).tar.xz: $(HOST_STAMP_INSTALLED) echo "$(PKG_VERSION)" > $(CMAKE_HOST_INSTALL_PREFIX)/.llvm-version STRIP_KMOD= PATCHELF= STRIP=strip $(SCRIPT_DIR)/rstrip.sh $(STAGING_DIR_HOST)/llvm-bpf tar -C $(STAGING_DIR_HOST) \ -I '$(STAGING_DIR_HOST)/bin/xz -7e -T$(if $(filter 1,$(NPROC)),2,0)' \ - -cf $(BIN_DIR)/llvm-bpf-$(PKG_VERSION).tar.xz llvm-bpf $(LLVM_BPF_PREFIX) - endef + -cf $@.tmp llvm-bpf $(LLVM_BPF_PREFIX) + mv $@.tmp $@ + +ifneq ($(CONFIG_SDK_LLVM_BPF),) +compile: $(BIN_DIR)/llvm-bpf-$(PKG_VERSION).tar.xz endif define Host/Install rm -rf $(STAGING_DIR_HOST)/llvm-bpf* $(Host/Install/Default) ln -s $(LLVM_BPF_PREFIX) $(STAGING_DIR_HOST)/llvm-bpf - $(Host/Install/Bin) endef define Host/Uninstall