From 8aad43851e5620aca6ffff1e9bf94a64a60ca410 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 30 Mar 2011 20:24:53 +0000
Subject: Upgrade to GCC-4.6.0. Fixes #2847.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9493 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/binutils.xml | 2 +-
 chapter06/grub.xml     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 9f11bacee..521eb659a 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -108,7 +108,7 @@ cd ../binutils-build</userinput></screen>
 
     <para>Test the results:</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="test">make -j check || true</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 6544a5217..dcea697d6 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -46,7 +46,8 @@
              --sysconfdir=/etc       \
              --disable-grub-emu-usb  \
              --disable-grub-fstest   \
-             --disable-efiemu</userinput></screen>
+             --disable-efiemu \
+             --disable-werror</userinput></screen>
 
     <para>The --disable switches minimize what is built by disabling features
     and testing programs not really needed for LFS.</para>
-- 
cgit v1.2.3-54-g00ecf