[PATCH v2 2/4] Makefile: Add ld.so.conf with libgcc dir to testroot.pristine

Andreas K. Hüttel dilfridge@gentoo.org
Sat Feb 8 16:09:02 GMT 2025


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 <dilfridge@gentoo.org>
---
 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  \
-- 
2.45.3



More information about the Libc-alpha mailing list