Changeset 6dfcfecc for chapter05/libstdc++.xml

Timestamp:

03/31/2021 10:41:39 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

7610848

Parents:

811b5a39

git-author:

Thomas Trepl <thomas@…> (06/29/2020 07:55:01 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:39 AM)

Message:

Update to new lfs structure

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11986 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter05/libstdc++.xml (modified) (8 diffs)

chapter05/libstdc++.xml

@@ -6 +6 @@
 ]>
 
-<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">
@@ -15 +15 @@
   </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>
 
@@ -29 +29 @@
     (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>
 
@@ -37 +38 @@
 
       <seglistitem>
-        <seg>&libstdcpp-ch5-sbu;</seg>
-        <seg>&libstdcpp-ch5-du;</seg>
+        <seg>&libstdcpp-tmpp1-sbu;</seg>
+        <seg>&libstdcpp-tmpp1-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -53 +54 @@
     </note>
 
-    <para>Create a separate build directory for Libstdc++ and enter it:</para>
+    <para>Create a separate build directory for libstdc++ and enter it:</para>
 
 <screen><userinput remap="pre">mkdir -v build
 cd       build</userinput></screen>
 
-    <para>Prepare Libstdc++ for compilation:</para>
+    <para>Prepare libstdc++ for compilation:</para>
 
 <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>
@@ -75 +76 @@
         <term><parameter>--host=...</parameter></term>
         <listitem>
-          <para>Indicates to use the cross compiler we have just built
+          <para>Specifies the use the cross compiler we have just built
           instead of the one in <filename>/usr/bin</filename>.</para>
         </listitem>
       </varlistentry>
-        <!--
-      <varlistentry>
-        <term><parameter>- -disable-libstdcxx-threads</parameter></term>
+
+      <varlistentry arch="ml_32,ml_x32,ml_all">
+        <term><parameter>--disable-multilib</parameter></term>
         <listitem>
-          <para>Since gcc-pass1 is built without thread support, the C++
-          thread library cannot be built either.</para>
+          <para>Even when building the multilib version, this switch is 
+          given. This is because the additionally built libraries are
+          not required in this stage and some disk space and compile
+          time can be saved.</para>
         </listitem>
       </varlistentry>
-        -->
+
       <varlistentry>
         <term><parameter>--disable-libstdcxx-pch</parameter></term>
@@ -99 +102 @@
         <term><parameter>--with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</parameter></term>
         <listitem>
-          <para>This is the location where the standard include files are
-          searched by the C++ compiler. In a normal build, this information
-          is automatically passed to the Libstdc++ <command>configure</command>
+          <para>This is the location where the C++ compiler should search for the
+          standard include files. In a normal build, this information
+          is automatically passed to the libstdc++ <command>configure</command>
           options from the top level directory. In our case, this information
           must be explicitly given.</para>
@@ -115 +118 @@
     <para>Install the library:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
   </sect2>