[openwrt/openwrt] tools/llvm-bpf: include host os/arch in tarball name

LEDE Commits lede-commits at lists.infradead.org
Sun Nov 21 04:47:54 PST 2021


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/203c86f0615663ebf3e9e0e068c5d75fd7739796

commit 203c86f0615663ebf3e9e0e068c5d75fd7739796
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Sun Nov 21 12:16:44 2021 +0100

    tools/llvm-bpf: include host os/arch in tarball name
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 tools/llvm-bpf/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/llvm-bpf/Makefile b/tools/llvm-bpf/Makefile
index 4b4e67e201..586c8dba2d 100644
--- a/tools/llvm-bpf/Makefile
+++ b/tools/llvm-bpf/Makefile
@@ -41,7 +41,7 @@ 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
 
-$(BIN_DIR)/llvm-bpf-$(PKG_VERSION).tar.xz: $(HOST_STAMP_INSTALLED)
+$(BIN_DIR)/$(LLVM_BPF_PREFIX).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) \
@@ -50,7 +50,7 @@ $(BIN_DIR)/llvm-bpf-$(PKG_VERSION).tar.xz: $(HOST_STAMP_INSTALLED)
 	mv $@.tmp $@
 
 ifneq ($(CONFIG_SDK_LLVM_BPF),)
-compile: $(BIN_DIR)/llvm-bpf-$(PKG_VERSION).tar.xz
+compile: $(BIN_DIR)/$(LLVM_BPF_PREFIX).tar.xz
 endif
 
 define Host/Install



More information about the lede-commits mailing list