From 0fa92755df1e4e47e060b71c701adafb4160c2da Mon Sep 17 00:00:00 2001
From: Zack Winkles <winkie@linuxfromscratch.org>
Date: Fri, 11 Jun 2004 15:49:18 +0000
Subject: Dropped GRUB hack in favor of the real upstream fix

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3776 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/grub.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 6b23a5cd5..e7175e231 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -34,15 +34,14 @@ have defined any environment variables that override default optimizations,
 such as CFLAGS and CXXFLAGS, we recommend un-setting them when building
 Grub.</para>
 
-<para>First prepare Grub for compilation:</para>
+<para>This package also has issues with being compiled by GCC 3.4, which we
+fix by applying the following patch:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen><userinput>patch -Np1 -i ../grub-&grub-version;-gcc34-1.patch</userinput></screen>
 
-<para>A few of the files comprising Grub have issues with optimizations done
-by GCC 3.4. Compile these few files with known-good optimizations:</para>
+<para>Prepare Grub for compilation:</para>
 
-<screen><userinput>make -C stage2 STAGE2_CFLAGS=-O2 \
-    pre_stage2_exec-builtins.o pre_stage2_exec-serial.o</userinput></screen>
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
 
 <para>Now compile the rest of the package:</para>
 
-- 
cgit v1.2.3-54-g00ecf