fix build error in tools on darwin on newer macs (patch by dirtyfreebooter)

SVN-Revision: 22934
This commit is contained in:
Felix Fietkau 2010-09-05 16:16:59 +00:00
parent 1c74711ec1
commit 392888845c
5 changed files with 3 additions and 22 deletions

View File

@ -32,11 +32,12 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
HOST_OS=`uname`; \ HOST_OS=`uname`; \
case "$$HOST_OS" in \ case "$$HOST_OS" in \
Linux) HOST_ARCH=`uname -m`;; \ Linux) HOST_ARCH=`uname -m`;; \
Darwin) HOST_ARCH=`uname -m`;; \
*) HOST_ARCH=`uname -p`;; \ *) HOST_ARCH=`uname -p`;; \
esac; \ esac; \
GNU_HOST_NAME=`gcc -dumpmachine`; \ GNU_HOST_NAME=`gcc -dumpmachine`; \
[ -n "$$GNU_HOST_NAME" ] || \ [ -z "$$GNU_HOST_NAME" -o "$$HOST_OS" == "Darwin" ] && \
GNU_HOST_NAME=`$(SCRIPT_DIR)/config.guess`; \ GNU_HOST_NAME=`$(TOPDIR)/scripts/config.guess`; \
echo "HOST_OS:=$$HOST_OS" > $@; \ echo "HOST_OS:=$$HOST_OS" > $@; \
echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \ echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \
echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \ echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \

View File

@ -17,11 +17,6 @@ include $(INCLUDE_DIR)/host-build.mk
unexport CFLAGS unexport CFLAGS
ifeq ($(HOST_OS),Darwin)
GNU_HOST_NAME:=
HOST_CONFIGURE_ARGS:=$(filter-out --target= --build= --host=,$(HOST_CONFIGURE_ARGS))
endif
HOST_CONFIGURE_VARS += \ HOST_CONFIGURE_VARS += \
LIBS=-lstdc++ LIBS=-lstdc++

View File

@ -17,11 +17,6 @@ include $(INCLUDE_DIR)/host-build.mk
unexport CFLAGS unexport CFLAGS
ifeq ($(HOST_OS),Darwin)
GNU_HOST_NAME:=
HOST_CONFIGURE_ARGS:=$(filter-out --target= --build= --host=,$(HOST_CONFIGURE_ARGS))
endif
HOST_CONFIGURE_ARGS += \ HOST_CONFIGURE_ARGS += \
--enable-static \ --enable-static \
--disable-shared \ --disable-shared \

View File

@ -17,11 +17,6 @@ include $(INCLUDE_DIR)/host-build.mk
unexport CFLAGS unexport CFLAGS
ifeq ($(HOST_OS),Darwin)
GNU_HOST_NAME:=
HOST_CONFIGURE_ARGS:=$(filter-out --target= --build= --host=,$(HOST_CONFIGURE_ARGS))
endif
HOST_CONFIGURE_ARGS += \ HOST_CONFIGURE_ARGS += \
--enable-static \ --enable-static \
--disable-shared \ --disable-shared \

View File

@ -17,11 +17,6 @@ include $(INCLUDE_DIR)/host-build.mk
unexport CFLAGS unexport CFLAGS
ifeq ($(HOST_OS),Darwin)
GNU_HOST_NAME:=
HOST_CONFIGURE_ARGS:=$(filter-out --target= --build= --host=,$(HOST_CONFIGURE_ARGS))
endif
HOST_CONFIGURE_ARGS += \ HOST_CONFIGURE_ARGS += \
--enable-static \ --enable-static \
--disable-shared --disable-shared