diff options
| author | Adeel Mujahid <adeelbm@outlook.com> | 2018-06-23 05:51:03 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2018-06-22 19:51:03 -0700 |
| commit | 328a2bdc754895bb2204f5daa4d8fa4529bc9dc4 (patch) | |
| tree | 5b1b6ac85606450573dd86606d16f5229813774e /init-tools.sh | |
| parent | 67af5834bf890632fe975fa27cae35c8404e726e (diff) | |
| download | coreclr-328a2bdc754895bb2204f5daa4d8fa4529bc9dc4.tar.gz coreclr-328a2bdc754895bb2204f5daa4d8fa4529bc9dc4.tar.bz2 coreclr-328a2bdc754895bb2204f5daa4d8fa4529bc9dc4.zip | |
Pass RID to crossgen (#18592)
Diffstat (limited to 'init-tools.sh')
| -rwxr-xr-x | init-tools.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/init-tools.sh b/init-tools.sh index 16c202cf2f..2adec1a64b 100755 --- a/init-tools.sh +++ b/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" |