From f050c30d057218d79b26239d9645af60a8c4e300 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 12 Oct 2024 16:16:58 +0800 Subject: [PATCH] sdk: bundle libraries for llvm toolchain This allows the llvm toolchain to be executed on different host. Also add it to strip list. Fixes: 0ac0840088d5 ("sdk: ship llvm toolchain") Signed-off-by: Tianling Shen Link: https://github.com/openwrt/openwrt/pull/16674 Signed-off-by: Hauke Mehrtens --- target/sdk/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/sdk/Makefile b/target/sdk/Makefile index f4b7640d2c..a2eb35c1d4 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -121,6 +121,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.zst: clean $(TAR) -xf - -C $(SDK_BUILD_DIR) (cd $(SDK_BUILD_DIR); find $(STAGING_SUBDIR_HOST)/bin $(STAGING_SUBDIR_HOST)/usr/bin \ + $(STAGING_SUBDIR_HOST)/llvm-bpf/bin $(STAGING_SUBDIR_HOST)/llvm-bpf/libexec \ $(STAGING_SUBDIR_TOOLCHAIN)/bin $(STAGING_SUBDIR_TOOLCHAIN)/*/bin $(STAGING_SUBDIR_TOOLCHAIN)/libexec \ $(KDIR_BASE) \ -type f | $(BUNDLER_COMMAND)) @@ -129,12 +130,15 @@ $(BIN_DIR)/$(SDK_NAME).tar.zst: clean find \ $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/bin \ $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/bin \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/llvm-bpf/bin \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/llvm-bpf/libexec \ $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/bin \ $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/*/bin \ $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/libexec \ -type f; \ find \ $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/lib \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/llvm-bpf/lib \ $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/lib \ -type f -name \*.so\*; \ ) | xargs strip 2>/dev/null >/dev/null