[lfs] 01/01: Merge branch 'trunk' into multilib

"Git Owner" ([email protected] via lfs-book Mailing List) <[email protected]>
Newsgroups gmane.linux.lfs.book
Message-ID <[email protected]>
This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch multilib
in repository lfs.

commit c076c72d9d1b06fcd7570c472ad5012efd186529
Merge: 67ebdb0a1 adf89fa11
Author: Zeckmathederg <[email protected]>
AuthorDate: Sat Apr 4 20:24:39 2026 -0600

    Merge branch 'trunk' into multilib

 chapter02/creatingfilesystem.xml |  21 +++-
 chapter02/creatingpartition.xml  |  52 +++++---
 chapter08/gcc.xml                |   3 +
 chapter08/grub.xml               | 160 +++++++++++++++++++++----
 chapter10/grub.xml               | 252 ++++++++++++++++++++++++++++++---------
 chapter10/kernel.xml             |  19 ++-
 chapter10/kernel/uefi.toml       |  12 ++
 chapter10/kernel/uefi.xml        |  22 ++++
 8 files changed, 436 insertions(+), 105 deletions(-)

diff --cc chapter08/gcc.xml
index e0dc4a847,71520b00b..ac41ac591
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@@ -65,16 -62,16 +65,18 @@@ cd       build</userinput></screen
  
      <para>Prepare GCC for compilation:</para>
  
 -<screen><userinput remap="configure">../configure --prefix=/usr            \
 -             LD=ld                    \
 -             --enable-languages=c,c++ \
 -             --enable-default-pie     \
 -             --enable-default-ssp     \
 -             --enable-host-pie        \
 -             --enable-targets=all     \
 -             --disable-multilib       \
 -             --disable-bootstrap      \
 -             --disable-fixincludes    \
++<!-- enable-targets=all is not needed for MLFS since the default arch will
++     always be 64-bit. -->
 +<screen><userinput remap="configure">../configure --prefix=/usr                \
 +             LD=ld                        \
 +             --enable-languages=c,c++     \
 +             --enable-default-pie         \
 +             --enable-default-ssp         \
 +             --enable-host-pie            \
 +             --enable-multilib            \
 +             --with-multilib-list=m64,m32 \
 +             --disable-bootstrap          \
 +             --disable-fixincludes        \
               --with-system-zlib</userinput></screen>
  
      <para>We only enable C and C++ here to save the build time as no
@@@ -138,6 -135,16 +140,7 @@@
            the Zlib library, rather than its own internal copy.</para>
          </listitem>
        </varlistentry>
+ 
 -      <varlistentry>
 -       <term><parameter>--enable-targets=all</parameter></term>
 -        <listitem>
 -          <para>This switch tells GCC to enable 64-bit code generation
 -          support even if we are building it for a 32-bit system.
 -          It's needed to build GRUB for 64-bit UEFI.  This switch has no
 -          effect if building for 64-bit.</para>
 -        </listitem>
 -      </varlistentry>
      </variablelist>
  
      <note>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.