Author: oxygene
Date: Fri Sep  3 10:53:06 2010
New Revision: 5768
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5768

Log:
The current workaround for binutils on mingw (or any non texinfo system) failed.
While we're at it, improve DESTDIR handling

Signed-off-by: Patrick Georgi <[email protected]>
Acked-by: Patrick Georgi <[email protected]>

Added:
   trunk/util/crossgcc/patches/binutils-2.20.1_no-bfd-doc.patch
Modified:
   trunk/util/crossgcc/buildgcc

Modified: trunk/util/crossgcc/buildgcc
==============================================================================
--- trunk/util/crossgcc/buildgcc        Fri Sep  3 00:02:53 2010        (r5767)
+++ trunk/util/crossgcc/buildgcc        Fri Sep  3 10:53:06 2010        (r5768)
@@ -372,9 +372,6 @@
 else
 printf "Building binutils ${BINUTILS_VERSION} ... "
 (
-       # workaround for building binutils 2.20.1 on MINGW:
-       touch binutils-${BINUTILS_VERSION}/bfd/doc/bfd.info
-       # now build binutils
        cd build-binutils
        rm -f .failed
        ../binutils-${BINUTILS_VERSION}/configure --prefix=$TARGETDIR 
--target=${TARGETARCH} \
@@ -394,6 +391,7 @@
 printf "Building GCC ${GCC_VERSION} ... "
 (
        cd build-gcc
+       export PATH=$PATH:$DESTDIR$TARGETDIR/bin
        rm -f .failed
        # GCC does not honour HOSTCFLAGS at all. CFLAGS are used for
        # both target and host object files. This is pretty misdesigned.
@@ -423,7 +421,7 @@
 printf "Building GDB ${GDB_VERSION} ... "
 (
        cd build-gdb
-       export PATH=$PATH:$PREFIX/bin
+       export PATH=$PATH:$DESTDIR$TARGETDIR/bin
        rm -f .failed
        CFLAGS="$HOSTCFLAGS" ../gdb-${GDB_VERSION}/configure 
--prefix=$TARGETDIR --target=${TARGETARCH} \
                --without-python --disable-werror --disable-nls

Added: trunk/util/crossgcc/patches/binutils-2.20.1_no-bfd-doc.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/util/crossgcc/patches/binutils-2.20.1_no-bfd-doc.patch        Fri Sep 
 3 10:53:06 2010        (r5768)
@@ -0,0 +1,11 @@
+--- binutils-2.20.1/bfd/Makefile.in~   2010-07-25 10:56:45 +0000
++++ binutils-2.20.1/bfd/Makefile.in    2010-07-25 10:19:24 +0000
+@@ -320,7 +320,7 @@
+ # RELEASE=y
+ INCDIR = $(srcdir)/../include
+ CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
+-SUBDIRS = doc po
++SUBDIRS = po
+ bfddocdir = doc
+ libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \
+       @SHARED_LDFLAGS@ $(am__empty)

-- 
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to