Changes in BOOK/final-system/ppc64/yaboot.xml [396b325:dabbced]

File:

• BOOK/final-system/ppc64/yaboot.xml (modified) (3 diffs)

BOOK/final-system/ppc64/yaboot.xml

@@ -24 +24 @@
     <para>Existing multilib distributions alter gcc to default to 32-bit
     output.  Because our gcc defaults to 64-bit, we need to pass appropriate
-    options to both the compiler and the linker.  To prevent the build from
-    failing due to compiler warnings, the -Werror flag is removed.  The 
-    Makefile already overrides any CC and ignores LDFLAGS in favour of 
-    its own variables, so we need to use the following seds for a 
-    successful compile and install.</para>
+    options to both the compiler and the linker.  The Makefile already
+    overrides any CC and ignores LDFLAGS in favour of its own variables, so we
+    need to use the following seds for a successful compile and install.</para>
 
 <screen><userinput>sed -i -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
-    -e "s/-Werror//" \
     -e "s/\(-Bstatic\)/-melf32ppclinux \1/" Makefile
 </userinput></screen>
@@ -47 +44 @@
       </varlistentry>
       <varlistentry>
-        <term><parameter>"s/-Werror//"</parameter></term>
-        <listitem>
-          <para>This deletes the -Werror flag from the Makefile.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term><parameter>"s/\(-Bstatic\)/-melf32ppclinux \1/"</parameter></term>
         <listitem>
@@ -63 +54 @@
 
     </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"