From: Felix Fietkau <nbd@nbd.name>
Date: Sun, 21 Nov 2021 11:16:44 +0000 (+0100)
Subject: tools/llvm-bpf: include host os/arch in tarball name
X-Git-Tag: v22.03.0-rc1~1145
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=203c86f0615663ebf3e9e0e068c5d75fd7739796;p=openwrt%2Fstaging%2Fhauke.git

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

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

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