Changeset 9c0c3a0


Ignore:
Timestamp:
03/31/2021 10:41:34 AM (3 years ago)
Author:
Xℹ Ruoyao <xry111@…>
Branches:
ml-11.0, multilib
Children:
172244e
Parents:
1b7c90c2
git-author:
Thomas Trepl <thomas@…> (04/11/2019 01:14:59 PM)
git-committer:
Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:34 AM)
Message:

Simplify instructions for multilib support. Fixes #4453

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

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • chapter05/gcc-pass1.xml

    r1b7c90c2 r9c0c3a0  
    122122esac</userinput></screen>
    123123
    124 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
    125     -i.orig gcc/config/i386/t-linux64
    126 cat > gcc/config/i386/t-linux64 &lt;&lt;"EOF"
    127 comma=,
    128 MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
    129 MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
    130 MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
    131 MULTILIB_OSDIRNAMES+= m32=../lib32$(call if_multiarch,:i386-linux-gnu)
    132 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
    133 EOF</userinput></screen>
     124<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/'  \
     125    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
     126    -i.orig gcc/config/i386/t-linux64</userinput></screen>
    134127
    135128<!--

  • chapter05/gcc-pass2.xml

    r1b7c90c2 r9c0c3a0  
    9797    libraries to <quote>lib</quote>:</para>
    9898
    99 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
    100     -i.orig gcc/config/i386/t-linux64
    101 cat > gcc/config/i386/t-linux64 &lt;&lt;"EOF"
    102 comma=,
    103 MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
    104 MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
    105 MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
    106 MULTILIB_OSDIRNAMES+= m32=../lib32$(call if_multiarch,:i386-linux-gnu)
    107 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
    108 EOF</userinput></screen>
     99<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/'  \
     100    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
     101    -i.orig gcc/config/i386/t-linux64</userinput></screen>
    109102
    110103    <para arch="default">As in the first build of GCC it requires the GMP,

  • chapter06/gcc.xml

    r1b7c90c2 r9c0c3a0  
    5555    libraries to <quote>lib</quote>:</para>
    5656
    57 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
    58     -i.orig gcc/config/i386/t-linux64
    59 cat &gt; gcc/config/i386/t-linux64 &lt;&lt;"EOF"
    60 comma=,
    61 MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
    62 MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
    63 MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
    64 MULTILIB_OSDIRNAMES+= m32=../lib32$(call if_multiarch,:i386-linux-gnu)
    65 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
    66 EOF</userinput></screen>
     57<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/'  \
     58    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
     59    -i.orig gcc/config/i386/t-linux64</userinput></screen>
    6760
    6861    <para>Remove the symlink created earlier as the final gcc includes will be
Note: See TracChangeset for help on using the changeset viewer.