summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-05 16:16:59 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-05 16:16:59 +0000
commita37b2b1bf9fdd4e1a5397b96e8456203e39e0903 (patch)
treefea483ba035a39a5f2f131b67da3dee55e5b6531
parentbebb0ec8a15f2314b9232811e523adb91dcb9de4 (diff)
fix build error in tools on darwin on newer macs (patch by dirtyfreebooter)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22934 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/host.mk5
-rw-r--r--tools/cloog/Makefile5
-rw-r--r--tools/gmp/Makefile5
-rw-r--r--tools/mpc/Makefile5
-rw-r--r--tools/ppl/Makefile5
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