Share init-compiler with arcade

dotnet · Sep 13, 2021 · b5e3e93 · b5e3e93
1 parent 206dba7
commit b5e3e93
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 135 deletions.
diff --git a/eng/common/native/find-native-compiler.sh b/eng/common/native/find-native-compiler.sh
diff --git a/eng/native/init-compiler.sh → eng/common/native/init-compiler.sh b/eng/native/init-compiler.sh → eng/common/native/init-compiler.sh
@@ -5,14 +5,16 @@
 
 if [[ "$#" -lt 2 ]]; then
  echo "Usage..."
- echo "detect-compiler.sh <Architecture> <compiler> <compiler major version> <compiler minor version>"
+ echo "init-compiler.sh <Architecture> <compiler> <compiler major version> <compiler minor version>"
  echo "Specify the target architecture."
  echo "Specify the name of compiler (clang or gcc)."
  echo "Specify the major version of compiler."
  echo "Specify the minor version of compiler."
  exit 1
 fi
 
+. "$( cd -P "$( dirname "$0" )" && pwd )"/../pipeline-logging-functions.sh
+
 build_arch="$1"
 compiler="$2"
 cxxCompiler="$compiler++"
@@ -58,23 +60,23 @@ if [[ -z "$CLR_CC" ]]; then
  if [[ -z "$majorVersion" ]]; then
  if command -v "$compiler" > /dev/null; then
  if [[ "$(uname)" != "Darwin" ]]; then
- echo "WARN: Specific version of $compiler not found, falling back to use the one in PATH."
+ Write-PipelineTelemetryError -category "Build" -type "warning" "Specific version of $compiler not found, falling back to use the one in PATH."
  fi
  CC="$(command -v "$compiler")"
  CXX="$(command -v "$cxxCompiler")"
  else
- echo "ERROR: No usable version of $compiler found."
+ Write-PipelineTelemetryError -category "Build" "No usable version of $compiler found."
  exit 1
  fi
  else
  if [[ "$compiler" == "clang" && "$majorVersion" -lt 5 ]]; then
  if [[ "$build_arch" == "arm" || "$build_arch" == "armel" ]]; then
  if command -v "$compiler" > /dev/null; then
- echo "WARN: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
+ Write-PipelineTelemetryError -category "Build" -type "warning" "Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
  CC="$(command -v "$compiler")"
  CXX="$(command -v "$cxxCompiler")"
  else
- echo "ERROR: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
+ Write-PipelineTelemetryError -category "Build" "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
  exit 1
  fi
  fi
@@ -83,7 +85,7 @@ if [[ -z "$CLR_CC" ]]; then
  else
  desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
  if [[ "$desired_version" == "-1" ]]; then
- echo "ERROR: Could not find specific version of $compiler: $majorVersion $minorVersion."
+ Write-PipelineTelemetryError -category "Build" "Could not find specific version of $compiler: $majorVersion $minorVersion."
  exit 1
  fi
  fi
@@ -95,15 +97,15 @@ if [[ -z "$CLR_CC" ]]; then
  fi
 else
  if [[ ! -f "$CLR_CC" ]]; then
- echo "ERROR: CLR_CC is set but path '$CLR_CC' does not exist"
+ Write-PipelineTelemetryError -category "Build" "CLR_CC is set but path '$CLR_CC' does not exist"
  exit 1
  fi
  CC="$CLR_CC"
  CXX="$CLR_CXX"
 fi
 
 if [[ -z "$CC" ]]; then
- echo "ERROR: Unable to find $compiler."
+ Write-PipelineTelemetryError -category "Build" "Unable to find $compiler."
  exit 1
 fi
 

diff --git a/eng/native/gen-buildsys.sh b/eng/native/gen-buildsys.sh
@@ -26,7 +26,7 @@ compiler="$4"
 majorVersion="$5"
 minorVersion="$6"
 
-source "$scriptroot/init-compiler.sh" "$build_arch" "$compiler" "$majorVersion" "$minorVersion"
+source "$scriptroot/../common/native/init-compiler.sh" "$build_arch" "$compiler" "$majorVersion" "$minorVersion"
 
 CCC_CC="$CC"
 CCC_CXX="$CXX"

diff --git a/src/mono/mono.proj b/src/mono/mono.proj
@@ -59,6 +59,8 @@
  <MonoCCompiler Condition="$(MonoCCompiler.StartsWith('-'))">$(MonoCCompiler.TrimStart('-'))</MonoCCompiler>
  <MonoCxxCompiler Condition="'$(MonoCCompiler)' == 'clang'">clang++</MonoCxxCompiler>
  <MonoCxxCompiler Condition="'$(MonoCCompiler)' == 'gcc'">g++</MonoCxxCompiler>
+ <RepositoryEngineeringCommonDir>$([MSBuild]::NormalizeDirectory('$(RepositoryEngineeringDir)', 'common'))</RepositoryEngineeringCommonDir>
+ <CrossToolchainFile>$([MSBuild]::NormalizePath('$(RepositoryEngineeringCommonDir)', 'cross', 'toolchain.cmake'))</CrossToolchainFile>
  </PropertyGroup>
 
  <!-- default thread suspend for specific platforms -->
@@ -222,7 +224,7 @@
 
  <!-- ARM Linux cross build options on CI -->
  <ItemGroup Condition="'$(TargetsAndroid)' != 'true' and '$(MonoCrossDir)' != '' and ('$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64')">
- <_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$([MSBuild]::NormalizePath('$(RepositoryEngineeringDir)', 'common', 'cross', 'toolchain.cmake'))" />
+ <_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" />
  <_MonoBuildEnv Condition="'$(Platform)' == 'arm64'" Include="TARGET_BUILD_ARCH=arm64" />
  <_MonoBuildEnv Condition="'$(Platform)' == 'arm'" Include="TARGET_BUILD_ARCH=arm" />
  <_MonoBuildEnv Condition="'$(Platform)' == 'arm64'" Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/aarch64-linux-gnu/pkgconfig" />
@@ -231,21 +233,21 @@
 
  <!-- x64 illumos cross build options -->
  <ItemGroup Condition="'$(TargetsIllumos)' == 'true' and '$(MonoCrossDir)' != ''">
- <_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$([MSBuild]::NormalizePath('$(RepositoryEngineeringDir)', 'common', 'cross', 'toolchain.cmake'))" />
+ <_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" />
  <_MonoBuildEnv Include="TARGET_BUILD_ARCH=x64" />
  <_MonoBuildEnv Include="PKG_CONFIG_PATH=$(MonoCrossDir)/lib/pkgconfig" />
  </ItemGroup>
 
  <!-- s390x Linux cross build options -->
  <ItemGroup Condition="'$(MonoCrossDir)' != '' and '$(TargetArchitecture)' == 's390x'">
- <_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$([MSBuild]::NormalizePath('$(RepositoryEngineeringDir)', 'common', 'cross', 'toolchain.cmake'))" />
+ <_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" />
  <_MonoBuildEnv Include="TARGET_BUILD_ARCH=s390x" />
  <_MonoBuildEnv Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/s390x-linux-gnu/pkgconfig" />
  </ItemGroup>
 
  <!-- x64 FreeBSD cross build options -->
  <ItemGroup Condition="'$(TargetsFreeBSD)' == 'true' and '$(MonoCrossDir)' != ''">
- <_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$([MSBuild]::NormalizePath('$(RepositoryEngineeringDir)', 'common', 'cross', 'toolchain.cmake'))" />
+ <_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" />
  <_MonoBuildEnv Include="TARGET_BUILD_ARCH=x64" />
  </ItemGroup>
 
@@ -462,7 +464,7 @@
  <PropertyGroup>
  <EMSDK_PATH>$([MSBuild]::EnsureTrailingSlash('$(EMSDK_PATH)'))</EMSDK_PATH>
  <_MonoCMakeConfigureCommand>cmake @(_MonoCMakeArgs, ' ') $(MonoCMakeExtraArgs) &quot;$(MonoProjectRoot.TrimEnd('\/'))&quot;</_MonoCMakeConfigureCommand>
- <_MonoCMakeConfigureCommand Condition="'$(TargetsBrowser)' != 'true' and '$(_MonoRunInitCompiler)' != 'false' and '$(OS)' != 'Windows_NT'">bash -c 'source $(RepositoryEngineeringDir)native/init-compiler.sh $(_CompilerTargetArch) $(MonoCCompiler) &amp;&amp; @(_MonoBuildEnv, ' ') $(_MonoCMakeConfigureCommand)'</_MonoCMakeConfigureCommand>
+ <_MonoCMakeConfigureCommand Condition="'$(TargetsBrowser)' != 'true' and '$(_MonoRunInitCompiler)' != 'false' and '$(OS)' != 'Windows_NT'">bash -c 'source $(RepositoryEngineeringCommonDir)native/init-compiler.sh $(_CompilerTargetArch) $(MonoCCompiler) &amp;&amp; @(_MonoBuildEnv, ' ') $(_MonoCMakeConfigureCommand)'</_MonoCMakeConfigureCommand>
  <_MonoCMakeConfigureCommand Condition="'$(TargetsBrowser)' != 'true' and '$(_MonoRunInitCompiler)' != 'false' and '$(OS)' == 'Windows_NT'">call &quot;$(RepositoryEngineeringDir)native\init-vs-env.cmd&quot; $(_CompilerTargetArch) &amp;&amp; cd /D &quot;$(MonoObjDir)&quot; &amp;&amp; @(_MonoBuildEnv, ' ') $(_MonoCMakeConfigureCommand)</_MonoCMakeConfigureCommand>
  <_MonoCMakeConfigureCommand Condition="'$(TargetsBrowser)' != 'true' and '$(_MonoRunInitCompiler)' == 'false'">$(_MonoCCOption) $(_MonoCXXOption) @(_MonoBuildEnv, ' ') $(_MonoCMakeConfigureCommand)</_MonoCMakeConfigureCommand>
  <_MonoCMakeConfigureCommand Condition="'$(TargetsBrowser)' == 'true' and '$(OS)' != 'Windows_NT'">bash -c 'source $(EMSDK_PATH)/emsdk_env.sh 2>&amp;1 &amp;&amp; emcmake $(_MonoCMakeConfigureCommand)'</_MonoCMakeConfigureCommand>