Changeset a0b689e


Ignore:
Timestamp:
02/11/2004 10:02:32 PM (20 years ago)
Author:
Alex Gronenwoud <alex@…>
Branches:
10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.0, 6.1, 6.1.1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, v5_1, v5_1_1, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
cd1ddd7
Parents:
c91dd5b
Message:

Adapting the title of the 'Locking in' section.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3249 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • chapter05/binutils-pass1.xml

    rc91dd5b ra0b689e  
    8484<screen><userinput>make install</userinput></screen>
    8585
    86 <para>Now prepare the linker for the "locking in" of Glibc later on:</para>
     86<para>Now prepare the linker for the "Adjusting" phase later on:</para>
    8787
    8888<screen><userinput>make -C ld clean
    … …  
    108108<literallayout></literallayout>
    109109
    110 <warning><para>Do not yet remove the Binutils build and source directories. You
    111 will need them again in their current state a bit further on in this
    112 chapter.</para></warning>
     110<warning><para><emphasis>Do not yet remove</emphasis> the Binutils build and
     111source directories. You will need them again in their current state a bit
     112further on in this chapter.</para></warning>
    113113
    114114<!-- HACK - Force some whitespace to appease tidy -->

  • chapter05/binutils-pass2.xml

    rc91dd5b ra0b689e  
    5959<screen><userinput>make install</userinput></screen>
    6060
    61 <para>Now prepare Binutils for the re-adjusting of the toolchain in the next
     61<para>Now prepare the linker for the "Re-adjusting" phase in the next
    6262chapter:</para>
    6363
    … …  
    6868<literallayout></literallayout>
    6969
    70 <warning><para>Do not yet remove the Binutils source and build directories.
    71 We'll need these directories again in the next chapter in the state they are in
    72 now.</para></warning>
     70<warning><para><emphasis>Do not yet remove</emphasis> the Binutils source and
     71build directories. You will need these directories again in the next chapter
     72in the state they are in now.</para></warning>
    7373
    7474<!-- HACK - Force some whitespace to appease tidy -->

  • chapter05/chapter05.xml

    rc91dd5b ra0b689e  
    440440
    441441
    442 <sect1 id="ch-tools-locking-glibc">
    443 <title>"Locking in" Glibc</title>
    444 <?dbhtml filename="lockingglibc.html" dir="chapter05"?>
     442<sect1 id="ch-tools-adjusting">
     443<title>Adjusting the toolchain</title>
     444<?dbhtml filename="adjusting.html" dir="chapter05"?>
    445445
    446446<para>Now that the temporary C libraries have been installed, we want all
    447447the tools compiled in the rest of this chapter to be linked against these
    448448libraries. To accomplish this, we need to adjust the linker and the compiler's
    449 specs file.</para>
    450 
    451 <para>First install the adjusted linker by running the following from within
     449specs file. Some people would say that it is <emphasis>"black magic juju below
     450this line"</emphasis>, but it is really very simple.</para>
     451
     452<para>First install the adjusted linker (adjusted at the end of the first pass
     453of Binutils) by running the following command from within
    452454the <filename class="directory">binutils-build</filename> directory:</para>
    453455
    454456<screen><userinput>make -C ld install</userinput></screen>
    455457
    456 <para>The linker was adjusted a little while back, at the end of the first
    457 pass of Binutils. From this point onwards everything will link <emphasis>only
    458 </emphasis> against the libraries in <filename>/tools/lib</filename>.</para>
     458<para>From this point onwards everything will link <emphasis>only</emphasis>
     459against the libraries in <filename>/tools/lib</filename>.</para>
    459460
    460461<note><para>If you somehow missed the earlier warning to retain the Binutils
    … …  
    466467second pass of Binutils a bit further on.</para></note>
    467468
    468 <para>Now that the adjusted linker is installed, you have to remove the
    469 Binutils build and source directories.</para>
     469<para>Now that the adjusted linker is installed, you have to
     470<emphasis>remove</emphasis> the Binutils build and source directories.</para>
    470471
    471472<para>The next thing to do is to amend our GCC specs file so that it points
    … …  
    542543<literallayout></literallayout>
    543544
    544 <para>This completes the installation of the self-contained toolchain, and it
    545 can now be used to build the rest of the temporary tools.</para>
    546 
    547545</sect1>
    548546

  • chapter05/gcc-pass2.xml

    rc91dd5b ra0b689e  
    168168
    169169<note><para>At this point it is strongly recommended to repeat the sanity check
    170 we performed earlier in the chapter. Refer back to
    171 <xref linkend="ch-tools-locking-glibc"/> and repeat the check. If the results are
     170we performed earlier in this chapter. Refer back to
     171<xref linkend="ch-tools-adjusting"/> and repeat the check. If the results are
    172172wrong, then most likely you forgot to apply the above mentioned GCC Specs
    173173patch.</para></note>

  • chapter06/chapter06.xml

    rc91dd5b ra0b689e  
    358358
    359359
    360 <sect1 id="ch-system-adjustingtoolchain">
     360<sect1 id="ch-system-readjusting">
    361361<title>Re-adjusting the toolchain</title>
    362 <?dbhtml filename="adjustingtoolchain.html" dir="chapter06"?>
    363 
    364 <para>Now that the new C libraries have been installed, it's time to re-adjust
    365 our toolchain. We'll adjust it so that it will link any newly compiled program
    366 against the new C libraries. Basically, this is the reverse of what we did
    367 in the "locking in" stage in the beginning of the previous chapter.</para>
    368 
    369 <para>The first thing to do is to adjust the linker. For this we retained the
     362<?dbhtml filename="readjusting.html" dir="chapter06"?>
     363
     364<para>Now that the new and final C libraries have been installed, it's time to
     365adjust our toolchain again. We'll adjust it so that it will link any newly
     366compiled program against these new libraries. This is in fact the same we did
     367in the "Adjusting" phase in the beginning of the previous chapter, even though
     368it looks like the reverse: then we guided the chain from the host's
     369<filename class="directory">{,/usr}/lib</filename> to the new
     370<filename class="directory">/tools/lib</filename>, now we guide it from that
     371same <filename class="directory">/tools/lib</filename>
     372to the LFS's <filename class="directory">{,/usr}/lib</filename>.</para>
     373
     374<para>First we adjust the linker. For this we retained the
    370375source and build directories from the second pass over Binutils. Install the
    371376adjusted linker by running the following from within the
    … …  
    379384don't have access to them, don't worry, all is not lost. Just ignore the above
    380385command. The result will be that the next package, Binutils, will link against
    381 the Glibc libraries in <filename class="directory">/tools</filename> rather
    382 than <filename class="directory">/usr</filename>. This is not ideal, however,
    383 our testing has shown that the resulting Binutils program binaries should be
    384 identical.</para></note>
     386the C libraries in <filename class="directory">/tools</filename> rather
     387than <filename class="directory">{,/usr}/lib</filename>. This is not ideal,
     388however, our testing has shown that the resulting Binutils program binaries
     389should be identical.</para></note>
    385390
    386391<para>From now on every compiled program will link <emphasis>only</emphasis>

  • chapter06/gcc.xml

    rc91dd5b ra0b689e  
    9191<note><para>At this point it is strongly recommended to repeat the sanity check
    9292we performed earlier in this chapter. Refer back to
    93 <xref linkend="ch-system-adjustingtoolchain"/> and repeat the check. If the results
     93<xref linkend="ch-system-readjusting"/> and repeat the check. If the results
    9494are wrong, then most likely you erroneously applied the GCC Specs patch from
    9595<xref linkend="chapter-temporary-tools"/>.</para></note>
Note: See TracChangeset for help on using the changeset viewer.