aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2012-08-22 15:07:32 +0000
committerJohn Crispin <john@openwrt.org>2012-08-22 15:07:32 +0000
commit3686b8d279c4ef5840a2001695de234ecdb313d9 (patch)
tree72f7e75cbf838791db6ae8eaad565377df6b4148
parent2811d6c1839c7860c698c26e90f40d50c14d96a5 (diff)
downloadupstream-3686b8d279c4ef5840a2001695de234ecdb313d9.tar.gz
upstream-3686b8d279c4ef5840a2001695de234ecdb313d9.tar.bz2
upstream-3686b8d279c4ef5840a2001695de234ecdb313d9.zip
derive system from hostcc to allow building inside a chroot
SVN-Revision: 33228
-rw-r--r--target/imagebuilder/Makefile4
-rw-r--r--target/sdk/Makefile4
-rw-r--r--target/toolchain/Makefile4
3 files changed, 6 insertions, 6 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 5d7b7ab5ed..a9480ef848 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -12,8 +12,8 @@ include $(INCLUDE_DIR)/version.mk
override MAKEFLAGS=
-PKG_OS:=$(shell uname -s)
-PKG_CPU:=$(shell uname -m | sed "s/ //g")
+PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
+PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))-for-$(PKG_OS)-$(PKG_CPU)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 99177984e2..51bf47b420 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -11,8 +11,8 @@ include $(INCLUDE_DIR)/host.mk
override MAKEFLAGS=
-PKG_OS:=$(shell uname -s)
-PKG_CPU:=$(shell uname -m)
+PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
+PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
SDK_NAME:=OpenWrt-SDK-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)-gcc-$(GCCV)_$(LIBC)-$(LIBCV)
SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile
index 0db18d1ac1..20f753a271 100644
--- a/target/toolchain/Makefile
+++ b/target/toolchain/Makefile
@@ -13,8 +13,8 @@ include $(INCLUDE_DIR)/host.mk
override MAKEFLAGS=
-PKG_OS:=$(shell uname -s)
-PKG_CPU:=$(shell uname -m)
+PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
+PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX)
TOOLCHAIN_BUILD_DIR:=$(BUILD_DIR)/$(TOOLCHAIN_NAME)