diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-08-22 15:07:32 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-08-22 15:07:32 +0000 |
| commit | 951215d74799ef2f4c28f70433008ae0b69822c1 (patch) | |
| tree | eacc43f6704efd9e58e431c20550917daed06867 /target | |
| parent | e56ca07f84b82dd706d3db24100f06d9d963939f (diff) | |
[target] derive system from hostcc to allow building inside a chroot
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33228 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/imagebuilder/Makefile | 4 | ||||
| -rw-r--r-- | target/sdk/Makefile | 4 | ||||
| -rw-r--r-- | target/toolchain/Makefile | 4 |
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) |