From 0d271ee7d872cc157f693991f3a45dde7f06f5e4 Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>
Date: May 16 2018 15:27:19 +0000
Subject: vars/build.vars:{{musl,gcc}_full,gcc_stage1_native_mingw32}:${PKG_BASE_DIR}: canonicalised.


---

diff --git a/vars/build.vars b/vars/build.vars
index b467fb6..c52a18e 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -248,9 +248,9 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_MUSL_FULL_SHA256SUM:=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e};
 : ${PKG_MUSL_FULL_VERSION:=1.1.12};
 : ${PKG_MUSL_FULL_URL:=http://www.musl-libc.org/releases/musl-${PKG_MUSL_NATIVE_VERSION}.tar.gz};
-: ${PKG_MUSL_FULL_BASE_DIR:=${BUILD_WORKDIR}/musl-build-native};
+: ${PKG_MUSL_FULL_BASE_DIR:=${BUILD_WORKDIR}/musl-native-${DEFAULT_TARGET}};
 : ${PKG_GCC_FULL_VERSION:=4.6.4};
-: ${PKG_GCC_FULL_BASE_DIR:=${BUILD_WORKDIR}/gcc-build-native};
+: ${PKG_GCC_FULL_BASE_DIR:=${BUILD_WORKDIR}/gcc-native-${DEFAULT_TARGET}};
 : ${PKG_GCC_FULL_GITROOT:=${DEFAULT_GITROOT}};
 
 #
@@ -267,7 +267,7 @@ NATIVE_TOOLCHAIN_MINGW32_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BINUTILS_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/binutils-${PKG_BINUTILS_MINGW32_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_MINGW32_LIBTOOL:=slibtool-static};
 : ${PKG_GCC_STAGE1_NATIVE_MINGW32_VERSION:=4.6.4};
-: ${PKG_GCC_STAGE1_NATIVE_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-build-native-mingw32};
+: ${PKG_GCC_STAGE1_NATIVE_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-native-x86_64-w64-mingw32};
 : ${PKG_GCC_STAGE1_NATIVE_MINGW32_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_STAGE1_NATIVE_MINGW32_TARGET:=x86_64-w64-mingw32};