From ff98a17d4f94b8c7ae8e50cf82a270e500f3f5a2 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 27 Nov 2011 22:13:09 +0100
Subject: take config.guess from binutils instead of gcc

binutils comes before gcc and also has a newer config.guess.
---
 src/binutils.mk | 7 +++++++
 src/gcc.mk      | 5 +----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/binutils.mk b/src/binutils.mk
index 14a1a53..d675cb2 100644
--- a/src/binutils.mk
+++ b/src/binutils.mk
@@ -21,8 +21,15 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
+    # install config.guess for general use
+    $(INSTALL) -d '$(PREFIX)/bin'
+    $(INSTALL) -m755 '$(1)/config.guess' '$(PREFIX)/bin/'
+    $(INSTALL) -m755 '$(1)/config.sub' '$(PREFIX)/bin/'
+
+    # Cannot use BUILD which was defined before config.guess existed.
     cd '$(1)' && ./configure \
         --target='$(TARGET)' \
+        --build="`config.guess`" \
         --prefix='$(PREFIX)' \
         --with-gcc \
         --with-gnu-ld \
diff --git a/src/gcc.mk b/src/gcc.mk
index d23d9e5..449243a 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -29,14 +29,11 @@ define $(PKG)_BUILD
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpfr)
     mv '$(1)/$(gcc-mpfr_SUBDIR)' '$(1)/mpfr'
 
-    # install config.guess for general use
-    $(INSTALL) -m755 '$(1)/config.guess' '$(PREFIX)/bin'
-    $(INSTALL) -m755 '$(1)/config.sub' '$(PREFIX)/bin'
-
     # build GCC and support libraries
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
         --target='$(TARGET)' \
+        --build='$(BUILD)' \
         --prefix='$(PREFIX)' \
         --libdir='$(PREFIX)/lib' \
         --enable-languages='c,c++,objc,fortran' \
-- 
cgit v0.12