summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-09-03 08:53:06 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-09-03 08:53:06 +0000
commitba3b0ebdf8dfc054d962ac291a538d41770c4419 (patch)
tree008b37d89d15958288dafbab0d6a6886175135fd /util
parent8377c2d4bfabf69f42f7af86cea85bbd207473ab (diff)
downloadcoreboot-ba3b0ebdf8dfc054d962ac291a538d41770c4419.tar.xz
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 <patrick.georgi@coresystems.de> Acked-by: Patrick Georgi <patrick.georgi@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5768 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util')
-rwxr-xr-xutil/crossgcc/buildgcc6
-rw-r--r--util/crossgcc/patches/binutils-2.20.1_no-bfd-doc.patch11
2 files changed, 13 insertions, 4 deletions
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 512b049771..f25685121c 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -372,9 +372,6 @@ if [ -f build-binutils/.success ]; then
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 @@ else
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 @@ else
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
diff --git a/util/crossgcc/patches/binutils-2.20.1_no-bfd-doc.patch b/util/crossgcc/patches/binutils-2.20.1_no-bfd-doc.patch
new file mode 100644
index 0000000000..a75a402a8d
--- /dev/null
+++ b/util/crossgcc/patches/binutils-2.20.1_no-bfd-doc.patch
@@ -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)