From cc53b4c1e967254ddd7c73f01670f9609f3f0e49 Mon Sep 17 00:00:00 2001
From: Ivan Mahonin <bh@icystar.com>
Date: Apr 06 2017 05:13:16 +0000
Subject: Fix toolchain


---

diff --git a/docker-builder-data/build/script/common/helpers.sh b/docker-builder-data/build/script/common/helpers.sh
index 2a5a375..12a9987 100644
--- a/docker-builder-data/build/script/common/helpers.sh
+++ b/docker-builder-data/build/script/common/helpers.sh
@@ -28,7 +28,7 @@ vars_copy() {
                 eval export ${2}${VAR#$1}='${!VAR}'
             else
                 eval ${2}${VAR#$1}='${!VAR}'
-            if
+            fi
         fi
     done
 }
diff --git a/docker-builder-data/build/script/common/manager.sh b/docker-builder-data/build/script/common/manager.sh
index 1d0b925..f5c8029 100755
--- a/docker-builder-data/build/script/common/manager.sh
+++ b/docker-builder-data/build/script/common/manager.sh
@@ -257,7 +257,7 @@ set_environment_vars() {
         if [ -z ${!VAR_FROM+x} ]; then
             unset $VAR
         else
-            eval $VAR='${!VAR_FROM}'
+            eval export $VAR='${!VAR_FROM}'
         fi
     done
 
@@ -265,7 +265,7 @@ set_environment_vars() {
     VARS_TO_RESTORE=
     for VAR in $(allvars); do
         if [[ "$VAR" = TC_* ]]; then
-            VARS_TO_RESTORE="$VARS_TO_RESTORE ${2}${VAR#$1}"
+            VARS_TO_RESTORE="$VARS_TO_RESTORE ${VAR#TC_}"
         fi
     done
     vars_restore "TC_" "export"
@@ -402,7 +402,7 @@ foreach_deps() {
     local PROCESS_SELF=""
     if [ "$NATIVE" = "native" ]; then
         CURRENT_DEPS=$DEPS_NATIVE
-        if [ ! -z "$TOOLCHAIN_HOST" ]; then
+        if [ ! -z "$TC_HOST" ]; then
             PROCESS_SELF="process_self"
         fi
     fi
@@ -423,7 +423,7 @@ foreach_deps() {
 
     if [ "$RECURSIVE" = "recursive" ]; then
         for DEP in $CURRENT_DEPS_NATIVE; do
-            if [ ! -z "$DEP" ] && [ "$DEP" != "$NAME" -o ! -z "$TOOLCHAIN_HOST" ]; then
+            if [ ! -z "$DEP" ] && [ "$DEP" != "$NAME" -o ! -z "$TC_HOST" ]; then
                 local DEP_LOCAL=$DEP 
                 if ! native foreach_deps "$DEP_LOCAL" "$FUNC" "$RECURSIVE"; then
                     return 1
@@ -462,7 +462,7 @@ is_complete() {
     local WAS_ARCH=$ARCH
     local WAS_PACKET_DIR=$PACKET_DIR
     local PROCESS_SELF=""
-    if [ ! -z "$TOOLCHAIN_HOST" ]; then
+    if [ ! -z "$TC_HOST" ]; then
         PROCESS_SELF="process_self"
     fi
 
@@ -568,7 +568,7 @@ prepare() {
     local WAS_ARCH=$ARCH
     local WAS_PACKET_DIR=$PACKET_DIR
     local PROCESS_SELF=""
-    if [ ! -z "$TOOLCHAIN_HOST" ]; then
+    if [ ! -z "$TC_HOST" ]; then
         PROCESS_SELF="process_self"
     fi
 
diff --git a/docker-builder-data/build/script/toolchain/none.sh b/docker-builder-data/build/script/toolchain/none.sh
index 562bd59..4018e1d 100755
--- a/docker-builder-data/build/script/toolchain/none.sh
+++ b/docker-builder-data/build/script/toolchain/none.sh
@@ -4,6 +4,8 @@ vars_clear "TC_"
 
 # set vars which used explicitly in function manager.sh:set_environment_vars()
 
+export TC_HOST=""
+
 export TC_PATH="$INITIAL_PATH"
 export TC_LD_LIBRARY_PATH="$INITIAL_LD_LIBRARY_PATH"