From 800ee38e42564ae67c55f61824590f1f43607fea Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Sun, 30 Jun 2024 13:22:56 +0200
Subject: [PATCH] More updates on glibc instr

---
 chapter05/glibc.xml | 4 ++--
 chapter08/glibc.xml | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index ecd583755..bdf3ae00f 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -288,7 +288,7 @@ CXX="$LFS_TGT-g++ -m32" \
       --build=$(../scripts/config.guess) \
       --enable-kernel=&min-kernel;                \
       --with-headers=$LFS/usr/include    \
-      --enable-multi-arch                \
+      --disable-nscd                     \
       --libdir=/usr/lib32                \
       --libexecdir=/usr/lib32            \
       libc_cv_slibdir=/usr/lib32</userinput></screen>
@@ -360,7 +360,7 @@ CXX="$LFS_TGT-g++ -mx32" \
       --build=$(../scripts/config.guess) \
       --enable-kernel=&min-kernel;                \
       --with-headers=$LFS/usr/include    \
-      --enable-multi-arch                \
+      --disable-nscd                     \
       --libdir=/usr/libx32               \
       --libexecdir=/usr/libx32           \
       libc_cv_slibdir=/usr/libx32</userinput></screen>
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 2539f7425..089e94fa3 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -645,8 +645,7 @@ find .. -name "*.a" -delete</userinput></screen>
       --host=i686-pc-linux-gnu           \
       --build=$(../scripts/config.guess) \
       --enable-kernel=&min-kernel;                \
-      --with-headers=/usr/include        \
-      --enable-multi-arch                \
+      --disable-nscd                     \
       --libdir=/usr/lib32                \
       --libexecdir=/usr/lib32            \
       libc_cv_slibdir=/usr/lib32</userinput></screen>
@@ -721,8 +720,7 @@ find .. -name "*.a" -delete</userinput></screen>
       --host=x86_64-pc-linux-gnux32      \
       --build=$(../scripts/config.guess) \
       --enable-kernel=&min-kernel;                \
-      --with-headers=/usr/include        \
-      --enable-multi-arch                \
+      --disable-nscd                     \
       --libdir=/usr/libx32               \
       --libexecdir=/usr/libx32           \
       libc_cv_slibdir=/usr/libx32</userinput></screen>