From f64bd4b6cef3b9a57f26928c1b8932534695cb72 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Thu, 19 May 2022 01:53:49 +0300 Subject: [PATCH] tools/elfutils: only build required components Building all of the components results in strip being installed in staging_dir/host/bin. This strip binary will take precedence over binutils strip that is installed in the toolchain directory. This will not work on host systems that do not have libdw installed, as we do not set HOST_LDFLAGS to override rpath to staging_dir/host/lib. However, rather than overriding rpath, we should just avoid using elfutils strip entirely. Override the SUBDIRS variable in the Makefile to only build and install the libraries we require for dwarves and frr. Fixes the following build failure in toolchain/gdb: strip: error while loading shared libraries: libdw.so.1: cannot open shared object file: No such file or directory Fixes: ad79b9271949 ("elfutils: move host build to tools") Reported-by: Dominick Grift Reported-by: Lucian Cristian Signed-off-by: Stijn Tintel --- tools/elfutils/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/elfutils/Makefile b/tools/elfutils/Makefile index 98694beb0effc2..2f4dd8f25303c8 100644 --- a/tools/elfutils/Makefile +++ b/tools/elfutils/Makefile @@ -29,4 +29,7 @@ HOST_CONFIGURE_ARGS += \ --without-lzma \ --without-zstd +HOST_MAKE_FLAGS += \ + SUBDIRS="lib libelf libcpu backends libebl libdwelf libdwfl libdw" + $(eval $(call HostBuild))