Use a consistent rootfs location (#2005)

diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh
index 37d9154bb311ab412170f136d436789ed0664aab..274995f11c889c6d212936a9981f9909b9bd2e88 100755 (executable)
--- a/src/coreclr/build-test.sh
+++ b/src/coreclr/build-test.sh
@@ -700,7 +700,7 @@ fi
 if [ $__CrossBuild == 1 ]; then
     export CROSSCOMPILE=1
     if ! [[ -n "$ROOTFS_DIR" ]]; then
-        export ROOTFS_DIR="$__RepoRootDir/eng/common/cross/rootfs/$__BuildArch"
+        export ROOTFS_DIR="$__RepoRootDir/.tools/rootfs/$__BuildArch"
     fi
 fi
 

diff --git a/src/installer/corehost/build.sh b/src/installer/corehost/build.sh
index 9d5db6b7a07dbc2c6c176022c6ee6ee4521a2831..e1fba6b35a351bf41fc4c0e283d41b85716bd3a3 100755 (executable)
--- a/src/installer/corehost/build.sh
+++ b/src/installer/corehost/build.sh
@@ -183,7 +183,7 @@ __cmake_defines="${__cmake_defines} ${__arch_define}"
 # Configure environment if we are doing a cross compile.
 if [ "$__CrossBuild" == 1 ]; then
     if ! [[ -n $ROOTFS_DIR ]]; then
-        export ROOTFS_DIR="$RootRepo/eng/common/cross/rootfs/$__build_arch"
+        export ROOTFS_DIR="$RootRepo/.tools/rootfs/$__build_arch"
     fi
 fi