summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2011-11-27 21:13:09 (GMT)
committerMark Brand <mabrand@mabrand.nl>2011-11-27 21:13:09 (GMT)
commitff98a17d4f94b8c7ae8e50cf82a270e500f3f5a2 (patch)
tree91b78c0741472788ff44aef97508fa0f6811a3c3
parent0b68635bc46185d9e2687948b8cbcd0a566c5ed7 (diff)
downloadmxe-ff98a17d4f94b8c7ae8e50cf82a270e500f3f5a2.zip
mxe-ff98a17d4f94b8c7ae8e50cf82a270e500f3f5a2.tar.gz
mxe-ff98a17d4f94b8c7ae8e50cf82a270e500f3f5a2.tar.bz2
take config.guess from binutils instead of gcc
binutils comes before gcc and also has a newer config.guess.
-rw-r--r--src/binutils.mk7
-rw-r--r--src/gcc.mk5
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' \