Use eng/common/native/init-os-and-arch.sh instead of eng/native/init-os-and-arch.sh (#97967)

Author: filipnavara

eng/build.sh

@@ -158,7 +158,7 @@ extraargs=''
 crossBuild=0
 portableBuild=1
 
-source $scriptroot/native/init-os-and-arch.sh
+source $scriptroot/common/native/init-os-and-arch.sh
 
 hostArch=$arch
 

eng/install-native-dependencies.sh

@@ -11,7 +11,7 @@ set -e
 os="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
 
 if [ -z "$os" ]; then
-    . "$(dirname "$0")"/native/init-os-and-arch.sh
+    . "$(dirname "$0")"/common/native/init-os-and-arch.sh
 fi
 
 case "$os" in

eng/native/build-commons.sh

@@ -282,7 +282,7 @@ usage()
     exit 1
 }
 
-source "$__RepoRootDir/eng/native/init-os-and-arch.sh"
+source "$__RepoRootDir/eng/common/native/init-os-and-arch.sh"
 
 __TargetArch=$arch
 __TargetOS=$os

eng/native/init-os-and-arch.sh

@@ -3,8 +3,8 @@ DOTNET:=$(TOP)dotnet.sh
 DOTNET_Q_ARGS=--nologo -v:q -consoleloggerparameters:NoSummary
 
 MONO_CONFIG?=Debug
-MONO_ARCH?=$(shell . $(TOP)eng/native/init-os-and-arch.sh && echo $${arch})
-TARGET_OS?=$(shell . $(TOP)eng/native/init-os-and-arch.sh && echo $${os})
+MONO_ARCH?=$(shell . $(TOP)eng/common/native/init-os-and-arch.sh && echo $${arch})
+TARGET_OS?=$(shell . $(TOP)eng/common/native/init-os-and-arch.sh && echo $${os})
 AOT?=false
 USE_LLVM?=false
 StripILCode?=false

src/mono/sample/HelloWorld/Makefile

@@ -3,7 +3,7 @@
 TOP=../../../../
 
 BUILD_CONFIG?=Debug
-TARGET_ARCH?=$(shell . $(TOP)eng/native/init-os-and-arch.sh && echo $${arch})
+TARGET_ARCH?=$(shell . $(TOP)eng/common/native/init-os-and-arch.sh && echo $${arch})
 TARGET_OS?=iossimulator
 DEPLOY_AND_RUN?=false
 STRIP_DEBUG_SYMBOLS?=false

src/mono/sample/iOS-NativeAOT/Makefile

@@ -1,6 +1,6 @@
 TOP=../../../../../
 CONFIG?=Debug
-MONO_ARCH?=$(shell . $(TOP)eng/native/init-os-and-arch.sh && echo $${arch})
+MONO_ARCH?=$(shell . $(TOP)eng/common/native/init-os-and-arch.sh && echo $${arch})
 DOTNET:=$(TOP)dotnet.sh
 
 run-sim:

src/mono/sample/mbr/apple/Makefile

@@ -6,8 +6,8 @@ DOTNET_Q_ARGS=--nologo -v:q -consoleloggerparameters:NoSummary
 CONFIG ?=Debug
 # How was dotnet/runtime built? should be the same as build.sh -c option
 BUILT_RUNTIME_CONFIG ?= Release
-MONO_ARCH?=$(shell . $(TOP)eng/native/init-os-and-arch.sh && echo $${arch})
-TARGET_OS?=$(shell . $(TOP)eng/native/init-os-and-arch.sh && echo $${os})
+MONO_ARCH?=$(shell . $(TOP)eng/common/native/init-os-and-arch.sh && echo $${arch})
+TARGET_OS?=$(shell . $(TOP)eng/common/native/init-os-and-arch.sh && echo $${os})
 
 MONO_ENV_OPTIONS = --interp
 

src/mono/sample/mbr/console/Makefile

@@ -50,7 +50,7 @@ readonly EXIT_CODE_TEST_FAILURE=2  # Script completed successfully, but one or m
 
 scriptPath="$(cd "$(dirname "$BASH_SOURCE[0]")"; pwd -P)"
 repoRootDir="$(cd "$scriptPath"/../..; pwd -P)"
-source "$repoRootDir/eng/native/init-os-and-arch.sh"
+source "$repoRootDir/eng/common/native/init-os-and-arch.sh"
 
 # Argument variables
 buildArch="$arch"