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 <cnsztl@immortalwrt.org>
Link: https://github.com/openwrt/openwrt/pull/16674
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index f4b7640d2cd3b32d1cf2d4d60deef13437e0deb6..a2eb35c1d4f13aa9c19ac2ab3f94286d92c79c44 100644 (file)
--- 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