From: Adeel Mujahid <adeelbm@outlook.com>
Date: Sat, 23 Jun 2018 02:51:03 +0000 (+0300)
Subject: Pass RID to crossgen (dotnet/coreclr#18592)
X-Git-Tag: submit/tizen/20210909.063632~11030^2~4532
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1853f0976437a41fe7a77ba4904437283f63d81f;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Pass RID to crossgen (dotnet/coreclr#18592)



Commit migrated from https://github.com/dotnet/coreclr/commit/328a2bdc754895bb2204f5daa4d8fa4529bc9dc4
---

diff --git a/src/coreclr/init-tools.sh b/src/coreclr/init-tools.sh
index 16c202cf2ff..2adec1a64b0 100755
--- a/src/coreclr/init-tools.sh
+++ b/src/coreclr/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"