浏览代码

Some reordering of glibc options to better match the original instructions

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11691 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Thomas Trepl 5 年之前
父节点
当前提交
8385ee237b
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      chapter06/glibc-32.xml

+ 4 - 3
chapter06/glibc-32.xml

@@ -55,10 +55,10 @@ CXX="g++ -m32 -ffile-prefix-map=/tools=/usr" \
              --disable-werror                       \
              --enable-kernel=&min-kernel;                    \
              --enable-stack-protector=strong        \
+             --with-headers=/usr/include            \
              --enable-multi-arch                    \
              --libdir=/usr/lib32                    \
              --libexecdir=/usr/lib32                \
-             --with-headers=/usr/include            \
              libc_cv_slibdir=/usr/lib32             \
              i686-pc-linux-gnu</userinput></screen>
 
@@ -110,7 +110,7 @@ ArchLinux's kernels are configured like
 
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
-# CONFIG_X86_X32 is not set
+# CONFIG_X86_X32 is not set    <<<<<
 
 It isn't x32-enabled ==> Error when building x32 stuff
 -->
@@ -132,9 +132,10 @@ CXX="g++ -mx32 -ffile-prefix-map=/tools=/usr" \
              --disable-werror                       \
              --enable-kernel=&min-kernel;                    \
              --enable-stack-protector=strong        \
+             --with-headers=/usr/include            \
              --enable-multi-arch                    \
              --libdir=/usr/libx32                   \
-             --with-headers=/usr/include            \
+             --libexecdir=/usr/libx32               \
              libc_cv_slibdir=/usr/libx32            \
              x86_64-pc-linux-gnux32</userinput></screen>