diff options
| author | Thomas Trepl <thomas@linuxfromscratch.org> | 2019-06-19 18:19:25 +0000 |
|---|---|---|
| committer | Thomas Trepl <thomas@linuxfromscratch.org> | 2019-06-19 18:19:25 +0000 |
| commit | a3df6070e42ed20c835a7f205191d9d6b70fad80 (patch) | |
| tree | 28762ed367f9f334cde49ba47fe277926f0c67f1 /chapter05/gcc-pass2.xml | |
| parent | 5d327aee1f6a1207b602099ef1747997977f1ba4 (diff) | |
MultiLib: Merge changes from trunk
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11623 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05/gcc-pass2.xml')
| -rw-r--r-- | chapter05/gcc-pass2.xml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 1b6a6b953..2ed39781e 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -75,13 +75,11 @@ do cp -uv $file{,.orig} sed -e 's@/lib\(64\)\?\(32\)\?\(x32\)\?/ld@/tools&@g' \ -e 's@/usr@/tools@g' $file.orig > $file - echo ' -#undef STANDARD_STARTFILE_PREFIX_1 -#undef STANDARD_STARTFILE_PREFIX_2 -#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/" -#define STANDARD_STARTFILE_PREFIX_2 ""' >> $file touch $file.orig -done</userinput></screen> +done +sed -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_1/ s;\".*\";\"/tools/lib/\";" \ + -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_2/ s;\".*\";\"\";" \ + -i gcc/gcc.c</userinput></screen> <para arch="default">If building on x86_64, change the default directory name for 64-bit libraries to <quote>lib</quote>:</para> |