From 392888845c01b5fb150a003c935ad43e708c9406 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 5 Sep 2010 16:16:59 +0000 Subject: [PATCH] fix build error in tools on darwin on newer macs (patch by dirtyfreebooter) SVN-Revision: 22934 --- include/host.mk | 5 +++-- tools/cloog/Makefile | 5 ----- tools/gmp/Makefile | 5 ----- tools/mpc/Makefile | 5 ----- tools/ppl/Makefile | 5 ----- 5 files changed, 3 insertions(+), 22 deletions(-) diff --git a/include/host.mk b/include/host.mk index 02365d9eab..8092e8db77 100644 --- a/include/host.mk +++ b/include/host.mk @@ -32,11 +32,12 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk HOST_OS=`uname`; \ case "$$HOST_OS" in \ Linux) HOST_ARCH=`uname -m`;; \ + Darwin) HOST_ARCH=`uname -m`;; \ *) HOST_ARCH=`uname -p`;; \ esac; \ GNU_HOST_NAME=`gcc -dumpmachine`; \ - [ -n "$$GNU_HOST_NAME" ] || \ - GNU_HOST_NAME=`$(SCRIPT_DIR)/config.guess`; \ + [ -z "$$GNU_HOST_NAME" -o "$$HOST_OS" == "Darwin" ] && \ + GNU_HOST_NAME=`$(TOPDIR)/scripts/config.guess`; \ echo "HOST_OS:=$$HOST_OS" > $@; \ echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \ echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \ diff --git a/tools/cloog/Makefile b/tools/cloog/Makefile index 3bbf812fe9..29b4b73040 100644 --- a/tools/cloog/Makefile +++ b/tools/cloog/Makefile @@ -17,11 +17,6 @@ include $(INCLUDE_DIR)/host-build.mk unexport CFLAGS -ifeq ($(HOST_OS),Darwin) - GNU_HOST_NAME:= - HOST_CONFIGURE_ARGS:=$(filter-out --target= --build= --host=,$(HOST_CONFIGURE_ARGS)) -endif - HOST_CONFIGURE_VARS += \ LIBS=-lstdc++ diff --git a/tools/gmp/Makefile b/tools/gmp/Makefile index f375ada347..514187ce6e 100644 --- a/tools/gmp/Makefile +++ b/tools/gmp/Makefile @@ -17,11 +17,6 @@ include $(INCLUDE_DIR)/host-build.mk unexport CFLAGS -ifeq ($(HOST_OS),Darwin) - GNU_HOST_NAME:= - HOST_CONFIGURE_ARGS:=$(filter-out --target= --build= --host=,$(HOST_CONFIGURE_ARGS)) -endif - HOST_CONFIGURE_ARGS += \ --enable-static \ --disable-shared \ diff --git a/tools/mpc/Makefile b/tools/mpc/Makefile index 3898830c0b..8f8f07f1cc 100644 --- a/tools/mpc/Makefile +++ b/tools/mpc/Makefile @@ -17,11 +17,6 @@ include $(INCLUDE_DIR)/host-build.mk unexport CFLAGS -ifeq ($(HOST_OS),Darwin) - GNU_HOST_NAME:= - HOST_CONFIGURE_ARGS:=$(filter-out --target= --build= --host=,$(HOST_CONFIGURE_ARGS)) -endif - HOST_CONFIGURE_ARGS += \ --enable-static \ --disable-shared \ diff --git a/tools/ppl/Makefile b/tools/ppl/Makefile index c9c09c5125..7eea73f0b0 100644 --- a/tools/ppl/Makefile +++ b/tools/ppl/Makefile @@ -17,11 +17,6 @@ include $(INCLUDE_DIR)/host-build.mk unexport CFLAGS -ifeq ($(HOST_OS),Darwin) - GNU_HOST_NAME:= - HOST_CONFIGURE_ARGS:=$(filter-out --target= --build= --host=,$(HOST_CONFIGURE_ARGS)) -endif - HOST_CONFIGURE_ARGS += \ --enable-static \ --disable-shared -- 2.30.2