From 08a0809fbbc4a7ae761b3e5d9279498964638dbc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Jan 2011 09:54:34 +0100 Subject: copy readelf only on Darwin build system On Cygwin readelf in this directory is not the right binary. The real binary is in .libs/readelf.exe. Toolchain building fails on Cygwin after copying the readelf thingy. --- toolchain/binutils/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'toolchain') diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index b2c281e37..33f03c7fb 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -40,8 +40,10 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled $(MAKE) -C $(WRKBUILD) install - # needed on hosts without readelf + # needed on hosts without readelf, but strange things happen on Cygwin. +ifeq (${OStype},Darwin) $(CP) $(WRKBUILD)/binutils/readelf $(STAGING_HOST_DIR)/bin +endif touch $@ include ${TOPDIR}/mk/toolchain.mk -- cgit v1.2.3 From 9f4a419ecb31241d54b0f2b244b0d159a17285c6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Jan 2011 09:56:24 +0100 Subject: copy fsf config.guess on Cygwin and use it. When compiling gmp under Windows XP on a 64 Bit AMD system, config.guess tries to build with ABI64 and fails. Using configfsf.guess in this case, will fix it. --- toolchain/gmp/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'toolchain') diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index 0e0ed0fca..ed0103ae9 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -12,8 +12,11 @@ endif $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: +ifneq (,$(filter CYGWIN%,${OStype})) + (cd $(WRKBUILD); cp configfsf.guess config.guess); +endif (cd $(WRKBUILD); \ - $(WRKBUILD)/configure \ + ./configure \ --prefix=$(STAGING_HOST_DIR) \ --disable-shared \ --enable-static \ -- cgit v1.2.3