From f5c3bf6e7e18f5dbb5af6da7f516187ce549aae5 Mon Sep 17 00:00:00 2001
From: "Thomas Trepl (Moody)" <thomas@linuxfromscratch.org>
Date: Thu, 13 May 2021 18:30:55 +0200
Subject: Use a configuration option to set the loader pathes in ldd

---
 chapter05/glibc.xml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'chapter05/glibc.xml')

diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 02ff025e2..8a28e4546 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -80,7 +80,8 @@ cd       build</userinput></screen>
       --build=$(../scripts/config.guess) \
       --enable-kernel=&min-kernel;                \
       --with-headers=$LFS/usr/include    \
-      libc_cv_slibdir=/usr/lib</userinput></screen>
+      libc_cv_slibdir=/usr/lib           \
+      libc_cv_rtlddir=/lib</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -121,6 +122,14 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>libc_cv_rtlddir=/lib</parameter></term>
+        <listitem>
+          <para>Fix hardcoded path to the executable loader in the
+            <command>ldd</command> script.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><option>libc_cv_include_x86_isa_level=no</option></term>
         <listitem>
@@ -184,12 +193,12 @@ cd       build</userinput></screen>
       </varlistentry>
 
     </variablelist>
-
+<!--
     <para>Fix hardcoded path to the executable loader in
     <command>ldd</command> script:</para>
 
 <screen><userinput remap="install">sed '/RTLDLIST=/s@/usr@@g' -i $LFS/usr/bin/ldd</userinput></screen>
-
+-->
     <caution>
       <para>At this point, it is imperative to stop and ensure that the basic
       functions (compiling and linking) of the new toolchain are working as
-- 
cgit v1.2.3-54-g00ecf