diff options
Diffstat (limited to 'mk/vars.mk')
-rw-r--r-- | mk/vars.mk | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 7179eb145..f1bf2be48 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -9,6 +9,7 @@ INSTALL_SCRIPT= install -m0755 MAKEFLAGS= $(EXTRA_MAKEFLAGS) BUILD_USER= $(shell id -un) BUILD_GROUP= $(shell id -gn) +ADK_SUFFIX:= _${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC} # some global dirs BASE_DIR:= $(TOPDIR) @@ -19,8 +20,8 @@ DL_DIR?= $(ADK_DL_DIR) endif SCRIPT_DIR:= $(BASE_DIR)/scripts STAGING_HOST_DIR:= ${BASE_DIR}/host_${GNU_HOST_NAME} -TOOLCHAIN_DIR:= ${BASE_DIR}/toolchain_${GNU_HOST_NAME} HOST_BUILD_DIR:= ${BASE_DIR}/host_build_${GNU_HOST_NAME} +TOOLCHAIN_DIR:= ${BASE_DIR}/toolchain${ADK_SUFFIX} # dirs for cleandir FW_DIR_PFX:= $(BASE_DIR)/firmware @@ -31,24 +32,13 @@ TOOLCHAIN_DIR_PFX= $(BASE_DIR)/toolchain_* STAGING_HOST_DIR_PFX:= ${BASE_DIR}/host_* TARGET_DIR_PFX:= $(BASE_DIR)/root_* -ifeq ($(ADK_TARGET_ABI),) -TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} -FW_DIR:= $(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} -BUILD_DIR:= ${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} -STAGING_TARGET_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC} -STAGING_PKG_DIR:= ${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} -STAGING_HOST2TARGET:= ../../target_${CPU_ARCH}_${ADK_TARGET_LIBC} -TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC} -else -TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI} -FW_DIR:= $(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI} -BUILD_DIR:= ${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI} -STAGING_TARGET_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI} -STAGING_PKG_DIR:= ${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI} -STAGING_HOST2TARGET:= ../../target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI} -TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI} -endif - +TARGET_DIR:= $(BASE_DIR)/root${ADK_SUFFIX} +FW_DIR:= $(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC} +BUILD_DIR:= ${BASE_DIR}/build${ADK_SUFFIX} +STAGING_TARGET_DIR:= ${BASE_DIR}/target${ADK_SUFFIX} +STAGING_PKG_DIR:= ${BASE_DIR}/pkg${ADK_SUFFIX} +STAGING_HOST2TARGET:= ../../target${ADK_SUFFIX} +TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build${ADK_SUFFIX} PACKAGE_DIR:= $(FW_DIR)/packages SCRIPT_TARGET_DIR:= ${STAGING_TARGET_DIR}/scripts |