aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2025-02-08 17:09:02 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2025-06-23 13:28:17 +0200
commit518b31f63fe2c3ef093a17b3ee9f9bcb87615027 (patch)
tree0450552c22a12502916bc900036b4f26395668c6
parent407fe3d694f099d892961ad634c5aae88b371dc9 (diff)
downloadglibc-518b31f63fe2c3ef093a17b3ee9f9bcb87615027.zip
glibc-518b31f63fe2c3ef093a17b3ee9f9bcb87615027.tar.gz
glibc-518b31f63fe2c3ef093a17b3ee9f9bcb87615027.tar.bz2
Makefile: Add ld.so.conf with libgcc dir to testroot.pristine
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> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 97b4328..cb927fb 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 \