diff --git a/config/functions b/config/functions
index 5ba8e8cd37..44cb8818a9 100644
--- a/config/functions
+++ b/config/functions
@@ -2,24 +2,24 @@ setup_toolchain() {
   case "$1" in
     target|init)
       export DESTIMAGE="target"
-      export CC="$TARGET_CC"
-      export CXX="$TARGET_CXX"
-      export CPP="$TARGET_CPP"
-      export LD="$TARGET_LD"
-      export AS="$TARGET_AS"
-      export AR="$TARGET_AR"
-      export NM="$TARGET_NM"
-      export RANLIB=$TARGET_RANLIB
-      export OBJCOPY=$TARGET_OBJCOPY
-      export OBJDUMP=$TARGET_OBJDUMP
-      export STRIP=$TARGET_STRIP
+      export CC="${TARGET_PREFIX}gcc"
+      export CXX="${TARGET_PREFIX}g++"
+      export CPP="${TARGET_PREFIX}cpp"
+      export LD="${TARGET_PREFIX}ld"
+      export AS="${TARGET_PREFIX}as"
+      export AR="${TARGET_PREFIX}ar"
+      export NM="${TARGET_PREFIX}nm"
+      export RANLIB="${TARGET_PREFIX}ranlib"
+      export OBJCOPY="${TARGET_PREFIX}objcopy"
+      export OBJDUMP="${TARGET_PREFIX}objdump"
+      export STRIP="${TARGET_PREFIX}strip"
       export CPPFLAGS="$TARGET_CPPFLAGS"
       export CFLAGS="$TARGET_CFLAGS"
       export CXXFLAGS="$TARGET_CXXFLAGS"
       export LDFLAGS="$TARGET_LDFLAGS"
-      export PKG_CONFIG_PATH="$TARGET_PKG_CONFIG_PATH"
-      export PKG_CONFIG_LIBDIR="$TARGET_PKG_CONFIG_LIBDIR"
-      export PKG_CONFIG_SYSROOT_DIR="$TARGET_PKG_CONFIG_SYSROOT_DIR"
+      export PKG_CONFIG_PATH=""
+      export PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
+      export PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
       export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
       export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr"
       if [ ! -f $CMAKE_CONF ] ; then
@@ -35,30 +35,39 @@ setup_toolchain() {
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)"  >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)"  >> $CMAKE_CONF
       fi
+      export HOST_CC="$ROOT/$TOOLCHAIN/bin/host-gcc"
+      export HOST_CXX="$ROOT/$TOOLCHAIN/bin/host-g++"
+      export HOSTCC="$HOST_CC"
+      export HOSTCXX="$HOST_CXX"
+      export CC_FOR_BUILD="$HOST_CC"
+      export CXX_FOR_BUILD="$HOST_CXX"
+      export BUILD_CC="$HOST_CC"
+      export BUILD_CXX="$HOST_CXX"
       export _python_sysroot="$SYSROOT_PREFIX"
       export _python_prefix=/usr
       export _python_exec_prefix=/usr
       ;;
     host|bootstrap)
       export DESTIMAGE="host"
-      export AWK=$HOST_AWK
-      export CC="$HOST_CC"
-      export CXX="$HOST_CXX"
-      export CPP="$HOST_CPP"
-      export LD="$HOST_LD"
-      export AS="$HOST_AS"
-      export AR="$HOST_AR"
-      export NM="$HOST_NM"
-      export RANLIB="$HOST_RANLIB"
-      export OBJCOPY="$HOST_OBJCOPY"
-      export STRIP="$HOST_STRIP"
+      export AWK="gawk"
+      export CC="$ROOT/$TOOLCHAIN/bin/host-gcc"
+      export CXX="$ROOT/$TOOLCHAIN/bin/host-g++"
+      export CPP="cpp"
+      export LD="ld"
+      export AS="as"
+      export AR="ar"
+      export NM="nm"
+      export RANLIB="ranlib"
+      export OBJCOPY="objcopy"
+      export OBJDUMP="objdump"
+      export STRIP="strip"
       export CPPFLAGS="$HOST_CPPFLAGS"
       export CFLAGS="$HOST_CFLAGS"
       export CXXFLAGS="$HOST_CXXFLAGS"
       export LDFLAGS="$HOST_LDFLAGS"
-      export PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH"
-      export PKG_CONFIG_LIBDIR="$HOST_PKG_CONFIG_LIBDIR"
-      export PKG_CONFIG_SYSROOT_DIR="$HOST_PKG_CONFIG_SYSROOT_DIR"
+      export PKG_CONFIG_PATH=""
+      export PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
+      export PKG_CONFIG_SYSROOT_DIR=""
       export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
       export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN"
       if [ ! -f $CMAKE_CONF ] ; then
@@ -74,6 +83,14 @@ setup_toolchain() {
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)" >> $CMAKE_CONF
       fi
+      export HOST_CC="$HOST_CC"
+      export HOST_CXX="$HOST_CXX"
+      export HOSTCC="$HOST_CC"
+      export HOSTCXX="$HOST_CXX"
+      export CC_FOR_BUILD="$HOST_CC"
+      export CXX_FOR_BUILD="$HOST_CXX"
+      export BUILD_CC="$HOST_CC"
+      export BUILD_CXX="$HOST_CXX"
       ;;
   esac
 }
diff --git a/config/path b/config/path
index e4f68ec081..9fe9e715f5 100644
--- a/config/path
+++ b/config/path
@@ -165,40 +165,8 @@ XORG_PATH_RGB=/usr/lib/X11/rgb
 XORG_PATH_MODULES=/usr/lib/xorg/modules
 XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 
-TARGET_CC=${TARGET_PREFIX}gcc
-TARGET_CXX=${TARGET_PREFIX}g++
-TARGET_CPP=${TARGET_PREFIX}cpp
-TARGET_LD=${TARGET_PREFIX}ld
-TARGET_AS=${TARGET_PREFIX}as
-TARGET_AR=${TARGET_PREFIX}ar
-TARGET_NM=${TARGET_PREFIX}nm
-TARGET_RANLIB=${TARGET_PREFIX}ranlib
-TARGET_OBJCOPY=${TARGET_PREFIX}objcopy
-TARGET_OBJDUMP=${TARGET_PREFIX}objdump
-TARGET_STRIP=${TARGET_PREFIX}strip
-
 . config/optimize
 
-TARGET_PKG_CONFIG_PATH=""
-TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
-TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
-
-HOST_AWK=gawk
-HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc
-HOST_CXX=$ROOT/$TOOLCHAIN/bin/host-g++
-HOST_CPP=cpp
-HOST_LD=ld
-HOST_AS=as
-HOST_AR=ar
-HOST_NM=nm
-HOST_RANLIB=ranlib
-HOST_OBJCOPY=objcopy
-HOST_STRIP=strip
-
-HOST_PKG_CONFIG_PATH=""
-HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
-HOST_PKG_CONFIG_SYSROOT_DIR=""
-
 if [ -z "$CCACHE_DIR" ]; then
     export CCACHE_DIR=$ROOT/.ccache/$PROJECT.$TARGET_ARCH-$OS_VERSION
 fi