|
@@ -16,7 +16,7 @@ BUILD_DIR:= ${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIB
|
|
|
BUILD_DIR_PFX:= $(BASE_DIR)/build_*
|
|
|
STAGING_PKG_DIR:= ${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
|
|
|
STAGING_PKG_DIR_PFX:= ${BASE_DIR}/pkg_*
|
|
|
-STAGING_HOST_DIR:= ${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_LIBC}
|
|
|
+STAGING_HOST_DIR:= ${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
|
|
|
STAGING_HOST_DIR_PFX:= ${BASE_DIR}/host_*
|
|
|
STAGING_JAVA_HOST_DIR:= ${BASE_DIR}/jhost
|
|
|
# use headers and foo-config from system
|
|
@@ -24,15 +24,15 @@ ifeq ($(ADK_NATIVE),y)
|
|
|
STAGING_TARGET_DIR:=
|
|
|
SCRIPT_TARGET_DIR:= /usr/bin
|
|
|
else
|
|
|
-STAGING_TARGET_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
|
|
|
+STAGING_TARGET_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
|
|
|
SCRIPT_TARGET_DIR:= ${STAGING_TARGET_DIR}/scripts
|
|
|
endif
|
|
|
-STAGING_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
|
|
|
+STAGING_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
|
|
|
STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_*
|
|
|
# relation from STAGING_HOST_DIR to STAGING_TARGET_DIR (for gcc to find
|
|
|
# its sysroot while staying relocatable)
|
|
|
-STAGING_HOST2TARGET:= ../target_${CPU_ARCH}_${ADK_TARGET_LIBC}
|
|
|
-TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}
|
|
|
+STAGING_HOST2TARGET:= ../target_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
|
|
|
+TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
|
|
|
TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
|
|
|
TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build
|
|
|
JTOOLS_BUILD_DIR= $(BASE_DIR)/jtools_build
|