summaryrefslogtreecommitdiff
path: root/mk/vars.mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-01 19:45:20 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-01 19:45:20 +0100
commit269e98c93f1bff77dc33701f1e5e8615a031ec0b (patch)
treed6e35e6da4bc19f657ac07ff8447ec065d85a4aa /mk/vars.mk
parentd1b6ea47f57cbcac8543a4dba976e13e3bc2e985 (diff)
parent2a8b0c42a074556bd489ef88a2b788f84ff6cf1e (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/vars.mk')
-rw-r--r--mk/vars.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index cba312e2d..53755266e 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -18,20 +18,20 @@ TARGET_CFLAGS:= $(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING
BASE_DIR:= $(TOPDIR)
DISTDIR?= ${BASE_DIR}/dl
-BUILD_DIR:= ${BASE_DIR}/build_${CPU_ARCH}
+BUILD_DIR:= ${BASE_DIR}/build_${ADK_TARGET}_${ADK_LIBC}
BUILD_DIR_PFX:= $(BASE_DIR)/build_*
-STAGING_PARENT:= ${BASE_DIR}/cross_${CPU_ARCH}
+STAGING_PARENT:= ${BASE_DIR}/cross_${ADK_TARGET}_${ADK_LIBC}
STAGING_PARENT_PFX:= ${BASE_DIR}/cross_*
STAGING_TOOLS:= ${STAGING_PARENT}/host
STAGING_DIR:= ${STAGING_PARENT}/target
-TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}
+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
SCRIPT_DIR:= $(BASE_DIR)/scripts
-BIN_DIR:= $(BASE_DIR)/bin_${ADK_TARGET}
-BIN_DIR_PFX:= $(BASE_DIR)/bin_*
+BIN_DIR:= $(BASE_DIR)/bin/${ADK_TARGET}_${ADK_LIBC}
+BIN_DIR_PFX:= $(BASE_DIR)/bin
PACKAGE_DIR:= $(BIN_DIR)/packages
-TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET}
+TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET}_${ADK_LIBC}
TARGET_DIR_PFX:= $(BASE_DIR)/root_*
TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH}
REAL_GNU_TARGET_NAME= $(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)