Changeset c7e74d6 for chapter05

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

d4248df

Parents:

6fc519e

git-author:

Thomas Trepl <thomas@…> (03/15/2020 10:56:46 AM)

git-committer:

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

Message:

MultiLib: Merge changes from trunk

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

Location:

chapter05

Files:

• gcc-pass2.xml (modified) (1 diff)
• libstdc++.xml (modified) (3 diffs)

chapter05/gcc-pass2.xml

@@ -121 +121 @@
 tar -xf ../isl-&isl-version;.tar.xz
 mv -v isl-&isl-version; isl</userinput></screen>
-
-    <!-- Following patch might be obsolete with gcc >= 8.2.1 --> 
-<!--
-    <para arch="ml_32,ml_x32,ml_all">Fix an issue with isl-&isl-version;:</para>
-
-<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e "/#include &lt;isl\/schedule_node.h&gt;/ a#include &lt;isl/id.h&gt;\n#include &lt;isl/space.h&gt;" \
-    -i gcc/graphite.h</userinput></screen>
--->
 
     <para>

chapter05/libstdc++.xml

@@ -64 +64 @@
     --prefix=/tools                 \
     --disable-multilib              \
-    --disable-nls                   \
-    --disable-libstdcxx-threads     \
+    --disable-nls                   \<!--
+    - -disable-libstdcxx-threads     \-->
     --disable-libstdcxx-pch         \
     --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</userinput></screen>
@@ -79 +79 @@
         </listitem>
       </varlistentry>
-
+        <!--
       <varlistentry>
-        <term><parameter>--disable-libstdcxx-threads</parameter></term>
+        <term><parameter>- -disable-libstdcxx-threads</parameter></term>
         <listitem>
           <para>Since gcc-pass1 is built without thread support, the C++
@@ -87 +87 @@
         </listitem>
       </varlistentry>
-
+        -->
       <varlistentry>
         <term><parameter>--disable-libstdcxx-pch</parameter></term>