From efcb3933433838b71f3a4a53ec1ac6d899aaec0b Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Sun, 3 May 2020 21:02:51 +0000
Subject: Make the new book

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11831 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/libstdc++.xml | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

(limited to 'chapter05/libstdc++.xml')

diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
index 66128aa8a..3a1b0f2bf 100644
--- a/chapter05/libstdc++.xml
+++ b/chapter05/libstdc++.xml
@@ -5,8 +5,8 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-tools-libstdcpp" role="wrap">
-  <?dbhtml filename="gcc-libstdc++.html"?>
+<sect1 id="ch-tools-libstdcpp-pass1" role="wrap">
+  <?dbhtml filename="gcc-libstdc++-pass1.html"?>
 
   <sect1info condition="script">
     <productname>gcc-libstdc++</productname>
@@ -14,11 +14,11 @@
     <address>&gcc-url;</address>
   </sect1info>
 
-  <title>Libstdc++ from GCC-&gcc-version;</title>
+  <title>Libstdc++ from GCC-&gcc-version;, Pass 1</title>
 
-  <indexterm zone="ch-tools-libstdcpp">
+  <indexterm zone="ch-tools-libstdcpp-pass1">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>tools, libstdc++</secondary>
+    <secondary>tools, libstdc++ pass 1</secondary>
   </indexterm>
 
   <sect2 role="package">
@@ -28,7 +28,8 @@
     to compile C++ code
     (part of GCC is written in C++), but we had to defer its installation
     when we built <xref linkend="ch-tools-gcc-pass1"/>
-    because it depends on glibc, which was not yet available in /tools.
+    because it depends on glibc, which was not yet available in the target
+    directory.
     </para>
 
     <segmentedlist>
@@ -61,10 +62,10 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="configure">../libstdc++-v3/configure           \
     --host=$LFS_TGT                 \
-    --prefix=/tools                 \
+    --build=$(../config.guess)      \
+    --prefix=/usr                   \
     --disable-multilib              \
-    --disable-nls                   \<!--
-    - -disable-libstdcxx-threads     \-->
+    --disable-nls                   \
     --disable-libstdcxx-pch         \
     --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</userinput></screen>
 
@@ -78,15 +79,7 @@ cd       build</userinput></screen>
           instead of the one in <filename>/usr/bin</filename>.</para>
         </listitem>
       </varlistentry>
-        <!--
-      <varlistentry>
-        <term><parameter>- -disable-libstdcxx-threads</parameter></term>
-        <listitem>
-          <para>Since gcc-pass1 is built without thread support, the C++
-          thread library cannot be built either.</para>
-        </listitem>
-      </varlistentry>
-        -->
+
       <varlistentry>
         <term><parameter>--disable-libstdcxx-pch</parameter></term>
         <listitem>
@@ -114,7 +107,7 @@ cd       build</userinput></screen>
 
     <para>Install the library:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
   </sect2>
 
-- 
cgit v1.2.3-54-g00ecf