Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa

external/corert/buildscripts/buildvars-setup.sh

@@ -23,6 +23,10 @@ setup_dirs()
 
     mkdir -p "$__ProductBinDir"
     mkdir -p "$__IntermediatesDir"
+    if [ $__CrossBuild = 1 ]; then
+        mkdir -p "$__ProductHostBinDir"
+        mkdir -p "$__IntermediatesHostDir"
+    fi
 }
 
 # Performs "clean build" type actions (deleting and remaking directories)
@@ -32,6 +36,10 @@ clean()
     echo "Cleaning previous output for the selected configuration"
     rm -rf "$__ProductBinDir"
     rm -rf "$__IntermediatesDir"
+    if [ $__CrossBuild = 1 ]; then
+        rm -rf "$__ProductHostBinDir"
+        rm -rf "$__IntermediatesHostDir"
+    fi
 }
 
 
@@ -107,6 +115,7 @@ case $CPUName in
         export __BuildArch=x64
         ;;
 esac
+export __HostArch=$__BuildArch
 
 # Use uname to determine what the OS is.
 export OSName=$(uname -s)
@@ -241,7 +250,13 @@ fi
 
 # Set the remaining variables based upon the determined build configuration
 export __IntermediatesDir="$__rootbinpath/obj/Native/$__BuildOS.$__BuildArch.$__BuildType"
+if [ $__CrossBuild = 1 ]; then
+    export __IntermediatesHostDir="$__rootbinpath/obj/Native/$__BuildOS.$__HostArch.$__BuildType"
+fi
 export __ProductBinDir="$__rootbinpath/Product/$__BuildOS.$__BuildArch.$__BuildType"
+if [ $__CrossBuild = 1 ]; then
+    export __ProductHostBinDir="$__rootbinpath/Product/$__BuildOS.$__HostArch.$__BuildType"
+fi
 export __RelativeProductBinDir="bin/Product/$__BuildOS.$__BuildArch.$__BuildType"
 
 # CI_SPECIFIC - On CI machines, $HOME may not be set. In such a case, create a subfolder and set the variable to set.