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-07-09 15:46:14 +0200
commitae589cb84df10825fc545a45c7007a5f79409bf1 (patch)
tree21a8cb6c1e490cb03db8a511ba849630e21eca4c
parentcf462982ac44bf0f5dfd36a9c242628f0d2970b9 (diff)
downloadglibc-ae589cb84df10825fc545a45c7007a5f79409bf1.zip
glibc-ae589cb84df10825fc545a45c7007a5f79409bf1.tar.gz
glibc-ae589cb84df10825fc545a45c7007a5f79409bf1.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 \