From 377270bda8d5c70968a07466b8e9afc8fa903043 Mon Sep 17 00:00:00 2001
From: "Thomas Trepl (Moody)" <thomas@linuxfromscratch.org>
Date: Sat, 19 Mar 2022 13:06:54 +0100
Subject: [PATCH] Fix changes in later gcc instructions

---
 chapter05/libstdc++.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
index 1311fadab..2c2ddd74e 100644
--- a/chapter05/libstdc++.xml
+++ b/chapter05/libstdc++.xml
@@ -60,7 +60,20 @@ cd       build</userinput></screen>
 
     <para>Prepare libstdc++ for compilation:</para>
 
-<screen><userinput remap="configure">../libstdc++-v3/configure           \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure" 
+    arch="ml_32">mlist=m64,m32</userinput><userinput remap="configure"
+    arch="ml_x32">mlist=m64,mx32</userinput><userinput remap="configure"
+    arch="ml_all">mlist=m64,m32,mx32</userinput>
+<userinput remap="configure">../libstdc++-v3/configure           \
+    --host=$LFS_TGT                 \
+    --build=$(../config.guess)      \
+    --prefix=/usr                   \
+    --enable-multilib               \
+    --with-multilib-list=$mlist     \
+    --disable-nls                   \
+    --disable-libstdcxx-pch         \
+    --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</userinput></screen>
+<screen arch="default"><userinput remap="configure">../libstdc++-v3/configure           \
     --host=$LFS_TGT                 \
     --build=$(../config.guess)      \
     --prefix=/usr                   \