From 762c430d034a822ebfe2d7b212f463b5aa394b97 Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>
Date: May 16 2018 20:38:58 +0000
Subject: vars/build.vars:gcc_{stage1,runtime,libstdcpp_v3,full}_host:${PKG_BASE_DIR}: canonicalise.

vars/build.vars:musl_{no_complex,full}_host:${PKG_BASE_DIR}: canonicalise.
vars/build.vars:gcc_stage1_cross_mingw32:${PKG_BASE_DIR}: canonicalise.

---

diff --git a/vars/build.vars b/vars/build.vars
index 37dd260..cccc489 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -130,7 +130,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_BINUTILS_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/binutils-${PKG_BINUTILS_HOST_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_HOST_PREFIX:=${PREFIX}};
 : ${PKG_GCC_STAGE1_HOST_VERSION:=4.6.4};
-: ${PKG_GCC_STAGE1_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-build};
+: ${PKG_GCC_STAGE1_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-${DEFAULT_TARGET}};
 : ${PKG_GCC_STAGE1_HOST_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_STAGE1_HOST_PREFIX:=${PREFIX}};
 : ${PKG_PSXSTUB_HOST_URLS_GIT:="psxstub=${DEFAULT_GITROOT}/psxstub"};
@@ -138,21 +138,21 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_PSXSTUB_HOST_BUILD_STEPS_DISABLE:=build};
 : ${PKG_PSXSTUB_HOST_ENV_VARS_EXTRA:=TARGET=${DEFAULT_TARGET}};
 : ${PKG_MUSL_NO_COMPLEX_HOST_VERSION:=1.1.12};
-: ${PKG_MUSL_NO_COMPLEX_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl_no_complex-build};
+: ${PKG_MUSL_NO_COMPLEX_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl_no_complex-host-${DEFAULT_TARGET}};
 : ${PKG_GCC_RUNTIME_HOST_VERSION:=4.6.4};
-: ${PKG_GCC_RUNTIME_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-build};
+: ${PKG_GCC_RUNTIME_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-${DEFAULT_TARGET}};
 : ${PKG_GCC_RUNTIME_HOST_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_RUNTIME_HOST_NO_CLEAN_BASE_DIR:=1};
 : ${PKG_GCC_RUNTIME_HOST_PREFIX:=${PREFIX}};
 : ${PKG_MUSL_FULL_HOST_VERSION:=1.1.12};
-: ${PKG_MUSL_FULL_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl_full-build};
+: ${PKG_MUSL_FULL_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl_full-host-${DEFAULT_TARGET}};
 : ${PKG_GCC_LIBSTDCPP_V3_HOST_VERSION:=4.6.4};
-: ${PKG_GCC_LIBSTDCPP_V3_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-build};
+: ${PKG_GCC_LIBSTDCPP_V3_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-${DEFAULT_TARGET}};
 : ${PKG_GCC_LIBSTDCPP_V3_HOST_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_LIBSTDCPP_V3_HOST_NO_CLEAN_BASE_DIR:=1};
 : ${PKG_GCC_LIBSTDCPP_V3_HOST_PREFIX:=${PREFIX}};
 : ${PKG_GCC_FULL_HOST_VERSION:=4.6.4};
-: ${PKG_GCC_FULL_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-build};
+: ${PKG_GCC_FULL_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-${DEFAULT_TARGET}};
 : ${PKG_GCC_FULL_HOST_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_FULL_HOST_NO_CLEAN_BASE_DIR:=1};
 : ${PKG_GCC_FULL_HOST_PREFIX:=${PREFIX}};
@@ -181,7 +181,7 @@ HOST_TOOLCHAIN_MINGW32_TARGET="x86_64-w64-mingw32";
 : ${PKG_BINUTILS_HOST_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/binutils-${PKG_BINUTILS_HOST_MINGW32_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_HOST_MINGW32_PREFIX:=${PREFIX}};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_VERSION:=4.6.4};
-: ${PKG_GCC_STAGE1_CROSS_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-build-mingw32};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-x86_64-w64-mingw32};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_PREFIX:=${PREFIX}};