diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-05 00:18:32 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-05 00:18:32 +0100 |
commit | 3ac04f9944e188e416aa183716caa1b799bba415 (patch) | |
tree | f43f33d67619cd45ee4496e9f31b5375f3324336 /toolchain | |
parent | d0398dc33628c501388d32dcb3faf68859dd6bcb (diff) | |
parent | f91e0ea142f7688b8e963f4cae1211e4b8ecdcc2 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
-rw-r--r-- | toolchain/binutils/Makefile | 4 | ||||
-rw-r--r-- | toolchain/gmp/Makefile | 5 |
2 files changed, 7 insertions, 2 deletions
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 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 \ |