From ae589cb84df10825fc545a45c7007a5f79409bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sat, 8 Feb 2025 17:09:02 +0100 Subject: [PATCH] Makefile: Add ld.so.conf with libgcc dir to testroot.pristine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way, a nonstandard directory within the testroot containing libgcc_s.so can actually be picked up and used during the test runs. Also provide a subdirectory ld.so.conf.d for drop-in configuration Signed-off-by: Andreas K. Hüttel Reviewed-by: Adhemerval Zanella --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 97b4328af8..cb927fb9f9 100644 --- a/Makefile +++ b/Makefile @@ -634,6 +634,11 @@ $(objpfx)testroot.pristine/install.stamp : cp $(objpfx)support/shell-container $(objpfx)testroot.pristine/bin/sh cp $(objpfx)support/echo-container $(objpfx)testroot.pristine/bin/echo cp $(objpfx)support/true-container $(objpfx)testroot.pristine/bin/true + # We need to be able to load extra language libraries. + mkdir -p $(objpfx)testroot.pristine/etc/ld.so.conf.d + echo 'include ld.so.conf.d/*.conf' > $(objpfx)testroot.pristine/etc/ld.so.conf + echo $(gnulib-extralibdir) >> $(objpfx)testroot.pristine/etc/ld.so.conf + echo '# file without content' > $(objpfx)testroot.pristine/etc/ld.so.conf.d/999-empty.conf ifeq ($(run-built-tests),yes) # Copy these DSOs first so we can overwrite them with our own. for dso in `$(test-wrapper-env) LD_TRACE_LOADED_OBJECTS=1 \