diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-02 13:50:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-02 13:50:49 +0100 |
| commit | 1a0bc22e751dc1a91073e47b61a4135cec549633 (patch) | |
| tree | 71d279d06dc068cc77cd360d45fd3599b962e3a0 /mk/vars.mk | |
| parent | 93f115b74d90ab06c101d37225fb6125d5dc33de (diff) | |
| parent | 0ccba89e05c01ce234adc7242ad7342d23b4f9df (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/vars.mk')
| -rw-r--r-- | mk/vars.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 3aff9fc76..88dad66fb 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -31,6 +31,7 @@ STAGING_DIR:= ${STAGING_PARENT}/target TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${ADK_TARGET}_${ADK_LIBC} TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_* TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build +TOOLS_DIR:= $(BASE_DIR)/bin/tools SCRIPT_DIR:= $(BASE_DIR)/scripts ifeq ($(ADK_HW),) BIN_DIR:= $(BASE_DIR)/bin/${ADK_TARGET}_${ADK_LIBC} @@ -45,7 +46,7 @@ else TARGET_DIR:= $(BASE_DIR)/root_${ADK_HW}_${ADK_TARGET}_${ADK_LIBC} endif TARGET_DIR_PFX:= $(BASE_DIR)/root_* -TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH} +TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH} REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux TOOLCHAIN_SYSROOT:= $(TOOLCHAIN_BUILD_DIR)/libc_dev @@ -85,8 +86,8 @@ HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${HOSTCC}' \ PKG_SUFFIX:= $(strip $(subst ",, $(ADK_PACKAGE_SUFFIX))) ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) -PKG_BUILD:= ${BASH} ${SCRIPT_DIR}/ipkg-build -c -o 0 -g 0 - +PKG_BUILD:= PATH='${TARGET_PATH}' \ + ${BASH} ${SCRIPT_DIR}/ipkg-build PKG_INSTALL:= IPKG_TMP=$(BUILD_DIR)/tmp \ IPKG_INSTROOT=$(TARGET_DIR) \ IPKG_CONF_DIR=$(STAGING_DIR)/etc \ |