Pass RID to crossgen (dotnet/corefx#30562)

Commit migrated from https://github.com/dotnet/corefx/commit/4aaf685b42201cbdb407c2cd3d3e0bcba72f3977

diff --git a/src/libraries/init-tools.sh b/src/libraries/init-tools.sh
index 4d656de..6728f28 100755 (executable)
--- a/src/libraries/init-tools.sh
+++ b/src/libraries/init-tools.sh
@@ -111,8 +111,8 @@ if [ ! -e "$__DOTNET_PATH" ]; then
                 __PKG_RID=linux
                 ;;
         esac
-
-        __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-$__PKG_RID-$__PKG_ARCH
+        __PKG_RID=$__PKG_RID-$__PKG_ARCH
+        __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-$__PKG_RID
     fi
     mkdir -p "$__DOTNET_PATH"
 
@@ -152,7 +152,7 @@ if [ ! -e "$__BUILD_TOOLS_PATH" ]; then
 fi
 
 if [ -z "${__ILASM_RID-}" ]; then
-    __ILASM_RID=$__PKG_RID-$__PKG_ARCH
+    __ILASM_RID=$__PKG_RID
 fi
 
 echo "Using RID $__ILASM_RID for BuildTools native tools"
@@ -182,7 +182,7 @@ echo "Making all .sh files executable under Tools."
 ls "$__scriptpath/Tools/"*.sh | xargs chmod +x
 ls "$__scriptpath/Tools/scripts/docker/"*.sh | xargs chmod +x
 
-"$__scriptpath/Tools/crossgen.sh" "$__scriptpath/Tools"
+"$__scriptpath/Tools/crossgen.sh" "$__scriptpath/Tools" $__PKG_RID
 
 mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch "$__BUILD_TOOLS_SEMAPHORE"