Changeset 5585711


Ignore:
Timestamp:
May 20, 2014, 10:17:36 AM (6 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
fab5058
Parents:
40e9518
Message:

Merged Build Flags pages with Build Variables, and moved those to final-preps

Location:
BOOK
Files:
12 added
7 deleted
27 edited
18 moved

Legend:

Unmodified
Added
Removed
  • BOOK/chroot/sparc64-64/flags.xml

    r40e9518 r5585711  
    2222
    2323   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    24    href="../../cross-tools/sparc64-64/flags.xml"
    25    xpointer="xpointer(//*[@os='e'])"/>
     24   href="../../final-preps/sparc64-64/variables.xml"
     25   xpointer="xpointer(//*[@os='k'])"/>
    2626
    2727   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    28    href="../../cross-tools/sparc64-64/flags.xml"
    29    xpointer="xpointer(//*[@os='f'])"/>
     28   href="../../final-preps/sparc64-64/variables.xml"
     29   xpointer="xpointer(//*[@os='l'])"/>
    3030
    3131</sect1>
  • BOOK/chroot/sparc64/flags.xml

    r40e9518 r5585711  
    3131
    3232   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33    href="../../cross-tools/sparc64/flags.xml"
    34    xpointer="xpointer(//*[@os='e'])"/>
     33   href="../../final-preps/sparc64/variables.xml"
     34   xpointer="xpointer(//*[@os='k'])"/>
    3535
    3636   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37    href="../../cross-tools/sparc64/flags.xml"
    38    xpointer="xpointer(//*[@os='f'])"/>
     37   href="../../final-preps/sparc64/variables.xml"
     38   xpointer="xpointer(//*[@os='l'])"/>
    3939
    4040</sect1>
  • BOOK/cross-tools/mips-chapter.xml

    r40e9518 r5585711  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/variables.xml"/>
    1615  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
  • BOOK/cross-tools/mips64-64-chapter.xml

    r40e9518 r5585711  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/variables.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
    1715  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
    1816  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
  • BOOK/cross-tools/mips64-chapter.xml

    r40e9518 r5585711  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/variables.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
    1715  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
    1816  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
  • BOOK/cross-tools/ppc-chapter.xml

    r40e9518 r5585711  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/variables.xml"/>
    1615  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
  • BOOK/cross-tools/ppc64-64-chapter.xml

    r40e9518 r5585711  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/variables.xml"/>
    1715  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
    1816  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
  • BOOK/cross-tools/ppc64-chapter.xml

    r40e9518 r5585711  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/variables.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
    1715  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
    1816  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
  • BOOK/cross-tools/sparc-chapter.xml

    r40e9518 r5585711  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/variables.xml"/>
    1615  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/linux-headers.xml"/>
  • BOOK/cross-tools/sparc64-64-chapter.xml

    r40e9518 r5585711  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/variables.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
    1715  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
    1816  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
  • BOOK/cross-tools/sparc64-chapter.xml

    r40e9518 r5585711  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/variables.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
    1715  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
    1816  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
  • BOOK/cross-tools/x86-chapter.xml

    r40e9518 r5585711  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
    1615  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
  • BOOK/cross-tools/x86_64-64-chapter.xml

    r40e9518 r5585711  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
    1715  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
    1816  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
  • BOOK/cross-tools/x86_64-chapter.xml

    r40e9518 r5585711  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/variables.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
    1715  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
    1816  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
  • BOOK/final-preps/common/aboutclfs.xml

    r40e9518 r5585711  
    22<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
    4   <!ENTITY % general-entities SYSTEM "../general.ent">
     4  <!ENTITY % general-entities SYSTEM "../../general.ent">
    55  %general-entities;
    66]>
  • BOOK/final-preps/common/abouttestsuites.xml

    r40e9518 r5585711  
    22<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
    4   <!ENTITY % general-entities SYSTEM "../general.ent">
     4  <!ENTITY % general-entities SYSTEM "../../general.ent">
    55  %general-entities;
    66]>
  • BOOK/final-preps/common/addinguser.xml

    r40e9518 r5585711  
    22<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
    4   <!ENTITY % general-entities SYSTEM "../general.ent">
     4  <!ENTITY % general-entities SYSTEM "../../general.ent">
    55  %general-entities;
    66]>
  • BOOK/final-preps/common/creatingcrossdir.xml

    r40e9518 r5585711  
    22<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
    4   <!ENTITY % general-entities SYSTEM "../general.ent">
     4  <!ENTITY % general-entities SYSTEM "../../general.ent">
    55  %general-entities;
    66]>
  • BOOK/final-preps/common/creatingtoolsdir.xml

    r40e9518 r5585711  
    22<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
    4   <!ENTITY % general-entities SYSTEM "../general.ent">
     4  <!ENTITY % general-entities SYSTEM "../../general.ent">
    55  %general-entities;
    66]>
  • BOOK/final-preps/common/settingenviron.xml

    r40e9518 r5585711  
    22<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
    4   <!ENTITY % general-entities SYSTEM "../general.ent">
     4  <!ENTITY % general-entities SYSTEM "../../general.ent">
    55  %general-entities;
    66]>
  • BOOK/final-preps/mips/variables.xml

    r40e9518 r5585711  
    3333<screen os="ad"><userinput>export CLFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
    3434
     35  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
     36
    3537    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../x86_64/variables.xml"
     38    href="../x86/variables.xml"
    3739    xpointer="xpointer(//*[@os='e'])"/>
    3840
  • BOOK/final-preps/mips64-64/variables.xml

    r40e9518 r5585711  
    4242
    4343    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../x86_64/variables.xml"
    45     xpointer="xpointer(//*[@os='e'])"/>
     44    href="../x86_64-64/variables.xml"
     45    xpointer="xpointer(//*[@os='g'])"/>
     46
     47<screen os="h"><userinput>export BUILD64="-mabi=64"</userinput></screen>
     48
     49  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
    4650
    4751    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../x86/variables.xml"
    49     xpointer="xpointer(//*[@os='f'])"/>
     52    href="../x86_64-64/variables.xml"
     53    xpointer="xpointer(//*[@os='i'])"/>
     54
     55    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     56    href="../x86_64-64/variables.xml"
     57    xpointer="xpointer(//*[@os='j'])"/>
    5058
    5159</sect1>
  • BOOK/final-preps/mips64/variables.xml

    r40e9518 r5585711  
    3939    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4040    href="../x86_64/variables.xml"
    41     xpointer="xpointer(//*[@os='m1'])"/>
     41    xpointer="xpointer(//*[@os='e'])"/>
    4242
    43 <screen os="m2"><userinput>export CLFS_TARGET32="$(echo ${CLFS_TARGET}| sed -e 's/64//g')"</userinput></screen>
     43<screen os="f"><userinput>export CLFS_TARGET32="$(echo ${CLFS_TARGET}| sed -e 's/64//g')"</userinput></screen>
     44
     45    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     46    href="../x86_64/variables.xml"
     47    xpointer="xpointer(//*[@os='g'])"/>
     48
     49<screen os="h"><userinput>export BUILD32="-mabi=32"
     50export BUILDN32="-mabi=n32"
     51export BUILD64="-mabi=64"</userinput></screen>
    4452
    4553  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
    4654
    4755    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../x86/variables.xml"
    49     xpointer="xpointer(//*[@os='e'])"/>
     56    href="../x86_64/variables.xml"
     57    xpointer="xpointer(//*[@os='i'])"/>
    5058
    51     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../x86_64/variables.xml"
    53     xpointer="xpointer(//*[@os='f'])"/>
     59<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
     60export CLFS_HOST="${CLFS_HOST}"
     61export CLFS_TARGET="${CLFS_TARGET}"
     62export CLFS_TARGET32="${CLFS_TARGET32}"
     63export BUILD32="${BUILD32}"
     64export BUILDN32="${BUILDN32}"
     65export BUILD64="${BUILD64}"
     66EOF</userinput></screen>
    5467
    5568</sect1>
  • BOOK/final-preps/ppc/variables.xml

    r40e9518 r5585711  
    2727<screen os="d"><userinput>export CLFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
    2828
     29  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
     30
    2931    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../x86_64/variables.xml"
     32    href="../x86/variables.xml"
    3133    xpointer="xpointer(//*[@os='e'])"/>
    3234
  • BOOK/final-preps/ppc64-64/variables.xml

    r40e9518 r5585711  
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../x86_64/variables.xml"
    31     xpointer="xpointer(//*[@os='m1'])"/>
    32 
    33 <screen os="m2"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
     30    href="../x86_64-64/variables.xml"
     31    xpointer="xpointer(//*[@os='g'])"/>
    3432
    3533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../x86_64/variables.xml"
    37     xpointer="xpointer(//*[@os='e'])"/>
     34    href="../x86_64-64/variables.xml"
     35    xpointer="xpointer(//*[@os='h'])"/>
     36
     37  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
    3838
    3939    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../x86_64/variables.xml"
    41     xpointer="xpointer(//*[@os='f'])"/>
     40    href="../x86_64-64/variables.xml"
     41    xpointer="xpointer(//*[@os='i'])"/>
     42
     43    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     44    href="../x86_64-64/variables.xml"
     45    xpointer="xpointer(//*[@os='j'])"/>
    4246
    4347</sect1>
  • BOOK/final-preps/ppc64/variables.xml

    r40e9518 r5585711  
    2525    xpointer="xpointer(//*[@os='c'])"/>
    2626
    27 <screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
     27<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3030    href="../x86_64/variables.xml"
    31     xpointer="xpointer(//*[@os='m1'])"/>
     31    xpointer="xpointer(//*[@os='e'])"/>
    3232
    33 <screen os="m2"><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
     33<screen os="f"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
     34
     35    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     36    href="../x86_64/variables.xml"
     37    xpointer="xpointer(//*[@os='g'])"/>
     38
     39    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     40    href="../x86_64/variables.xml"
     41    xpointer="xpointer(//*[@os='h'])"/>
    3442
    3543  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
    3644
    3745    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../x86/variables.xml"
    39     xpointer="xpointer(//*[@os='e'])"/>
     46    href="../x86_64/variables.xml"
     47    xpointer="xpointer(//*[@os='i'])"/>
    4048
    4149    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4250    href="../x86_64/variables.xml"
    43     xpointer="xpointer(//*[@os='f'])"/>
     51    xpointer="xpointer(//*[@os='j'])"/>
    4452
    4553</sect1>
  • BOOK/final-preps/sparc-chapter.xml

    r40e9518 r5585711  
    1111
    1212  <title>Final Preparations</title>
    13   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
    14   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
    17   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
    18   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
     13  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
     14  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
     15  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
     16  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
     17  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/variables.xml"/>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
    1920
    2021</chapter>
  • BOOK/final-preps/sparc/variables.xml

    r40e9518 r5585711  
    2727<screen os="d"><userinput>export CLFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
    2828
     29  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
     30
    2931    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../x86_64/variables.xml"
     32    href="../x86/variables.xml"
    3133    xpointer="xpointer(//*[@os='e'])"/>
    3234
  • BOOK/final-preps/sparc64/variables.xml

    r40e9518 r5585711  
    66]>
    77
    8 <sect1 id="ch-cross-tools-flags">
    9   <title>Build Flags</title>
    10   <?dbhtml filename="flags.html"?>
     8<sect1 id="ch-cross-tools-variables">
     9  <?dbhtml filename="variables.html"?>
    1110
    12   <para os="a">We will need to setup target specific flags for the compiler
    13   and linkers. You can choose the appropriate BUILD32 and BUILD64
     11  <title>Build Variables</title>
     12
     13  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
     14
     15    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     16    href="../x86/variables.xml"
     17    xpointer="xpointer(//*[@os='a'])"/>
     18
     19    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     20    href="../x86/variables.xml"
     21    xpointer="xpointer(//*[@os='b'])"/>
     22
     23    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     24    href="../x86/variables.xml"
     25    xpointer="xpointer(//*[@os='c'])"/>
     26
     27<screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../x86_64/variables.xml"
     31    xpointer="xpointer(//*[@os='e'])"/>
     32
     33<screen os="f"><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
     34
     35  <para os="g">We will need to setup target specific flags for the compiler
     36  and linkers. You can choose the appropriate BUILD32, BUILD64, and GCCTARGET
    1437  from the table at the bottom of the page.</para>
    1538
    16 <screen os="b"><userinput>export BUILD32="<replaceable>[BUILD32 entries]</replaceable>"
     39<screen os="h"><userinput>export BUILD32="<replaceable>[BUILD32 entries]</replaceable>"
    1740export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
    1841export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
    1942
    20    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    21    href="../multilib/flags.xml"
    22    xpointer="xpointer(//*[@os='c'])"/>
     43  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
    2344
    24 <screen os="d"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
     45    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     46    href="../x86_64/variables.xml"
     47    xpointer="xpointer(//*[@os='i'])"/>
     48
     49<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
     50export CLFS_HOST="${CLFS_HOST}"
     51export CLFS_TARGET="${CLFS_TARGET}"
     52export CLFS_TARGET32="${CLFS_TARGET32}"
    2553export BUILD32="${BUILD32}"
    2654export BUILD64="${BUILD64}"
     
    2856EOF</userinput></screen>
    2957
    30   <para os="e">The following table gives the entires for different Sparc 64 capable
     58  <para os="k">The following table gives the entries for different Sparc 64 capable
    3159  processors. Pick the processor that matches your system. Note: GCC settings are
    3260  only needed in the early sections of the book, and will not be used in the final-system
    3361  builds.</para>
    3462
    35   <table os="f">
     63  <table os="l">
    3664    <title>List of 32-Bit settings, 64-Bit Build settings, and GCC setting</title>
    3765    <?dbfo table-width="7in" ?>
  • BOOK/final-preps/x86_64-64/variables.xml

    r40e9518 r5585711  
    2929    xpointer="xpointer(//*[@os='d'])"/>
    3030
     31    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     32    href="../x86_64/variables.xml"
     33    xpointer="xpointer(//*[@os='g'])"/>
     34
     35<screen os="h"><userinput>export BUILD64="-m64"</userinput></screen>
     36
    3137  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
    3238
    3339    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../x86/variables.xml"
    35     xpointer="xpointer(//*[@os='e'])"/>
     40    href="../x86_64/variables.xml"
     41    xpointer="xpointer(//*[@os='i'])"/>
    3642
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../x86/variables.xml"
    39     xpointer="xpointer(//*[@os='f'])"/>
     43<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
     44export CLFS_HOST="${CLFS_HOST}"
     45export CLFS_TARGET="${CLFS_TARGET}"
     46export BUILD64="${BUILD64}"
     47EOF</userinput></screen>
    4048
    4149</sect1>
  • BOOK/final-preps/x86_64/variables.xml

    r40e9518 r5585711  
    2727<screen os="d"><userinput>export CLFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
    2828
    29   <para os="m1">Now set the target triplet for 32 bits:</para>
     29  <para os="e">Now set the target triplet for 32 bits:</para>
    3030
    31 <screen os="m2"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
     31<screen os="f"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
     32
     33  <para os="g">We will need to setup target-specific flags for the compiler
     34  and linker:</para>
     35
     36<screen os="h"><userinput>export BUILD32="-m32"
     37export BUILD64="-m64"</userinput></screen>
    3238
    3339  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
    3440
    35     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../x86/variables.xml"
    37     xpointer="xpointer(//*[@os='e'])"/>
     41  <para os="i">Now add the host and target variables, and compiler and linker
     42  flags, to <filename>~/.bashrc</filename>, just in case you have to exit and
     43  restart building later:</para>
    3844
    39 <screen os="f"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
     45<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
    4046export CLFS_HOST="${CLFS_HOST}"
    4147export CLFS_TARGET="${CLFS_TARGET}"
    4248export CLFS_TARGET32="${CLFS_TARGET32}"
     49export BUILD32="${BUILD32}"
     50export BUILD64="${BUILD64}"
    4351EOF</userinput></screen>
    4452
  • BOOK/introduction/common/changelog.xml

    r40e9518 r5585711  
    4545          this was done.</para>
    4646        </listitem>
     47        <listitem>
     48          <para>[Chris] - Removed separate "Build flags" pages and moved that
     49          info to "Build Variables" pages, and moved those from cross-tools
     50          to final-preps.</para>
     51        </listitem>
    4752      </itemizedlist>
    4853    </listitem>
  • BOOK/mips-index.xml

    r40e9518 r5585711  
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips-chapter.xml"/>
    30     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips-chapter.xml"/>
    3131
    3232  </part>
  • BOOK/mips64-64-index.xml

    r40e9518 r5585711  
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips64-64-chapter.xml"/>
    30     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips64-64-chapter.xml"/>
    3131
    3232  </part>
  • BOOK/mips64-index.xml

    r40e9518 r5585711  
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips64-chapter.xml"/>
    30     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips64-chapter.xml"/>
    3131
    3232  </part>
  • BOOK/ppc-index.xml

    r40e9518 r5585711  
    3030    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc-chapter.xml"/>
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc-chapter.xml"/>
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc-chapter.xml"/>
    3333
    3434  </part>
  • BOOK/ppc64-64-index.xml

    r40e9518 r5585711  
    3030    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc-chapter.xml"/>
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc64-64-chapter.xml"/>
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc64-64-chapter.xml"/>
    3333
    3434  </part>
  • BOOK/ppc64-index.xml

    r40e9518 r5585711  
    3030    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc64-chapter.xml"/>
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc64-chapter.xml"/>
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc64-chapter.xml"/>
    3333
    3434  </part>
  • BOOK/sparc-index.xml

    r40e9518 r5585711  
    3030    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc-chapter.xml"/>
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc-chapter.xml"/>
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc-chapter.xml"/>
    3333
    3434  </part>
  • BOOK/sparc64-64-index.xml

    r40e9518 r5585711  
    3030    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc64-chapter.xml"/>
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc64-64-chapter.xml"/>
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc64-64-chapter.xml"/>
    3333
    3434  </part>
  • BOOK/sparc64-index.xml

    r40e9518 r5585711  
    3030    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc64-chapter.xml"/>
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc64-chapter.xml"/>
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc64-chapter.xml"/>
    3333
    3434  </part>
  • BOOK/x86-index.xml

    r40e9518 r5585711  
    3030    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86-chapter.xml"/>
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86-chapter.xml"/>
    3333
    3434  </part>
  • BOOK/x86_64-64-index.xml

    r40e9518 r5585711  
    3030    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-64-chapter.xml"/>
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-64-chapter.xml"/>
    3333
    3434  </part>
  • BOOK/x86_64-index.xml

    r40e9518 r5585711  
    3030    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-chapter.xml"/>
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-chapter.xml"/>
    3333
    3434  </part>
Note: See TracChangeset for help on using the changeset viewer.