From 71f7f848e4741430ba99ca630a18b330b8b9ddae Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 27 Jan 2023 12:31:02 -0800 Subject: [PATCH] Target lower glibc for Linux arm64 (#80939) This uses new cross-build images that target Ubuntu 16.04, lowering the glibc requirements. The initial change is only for Linux arm64, to match what we plan to do in .NET 7. The 8.0 change will let us validate the PGO instrumentation, which happens in official builds, but not in PR jobs. --- eng/pipelines/common/templates/pipeline-with-resources.yml | 4 ++-- src/mono/mono.proj | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml index 7104841..c6e9c96 100644 --- a/eng/pipelines/common/templates/pipeline-with-resources.yml +++ b/eng/pipelines/common/templates/pipeline-with-resources.yml @@ -15,9 +15,9 @@ resources: ROOTFS_DIR: /crossrootfs/armv6 - container: linux_arm64 - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-arm64 env: - ROOTFS_DIR: /crossrootfs/arm64 + ROOTFS_DIR: /crossrootfs - container: linux_musl_x64 image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-WithNode diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 858659e3..e9019b5 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -714,6 +714,7 @@ aarch64-linux-gnu $(MonoObjCrossDir)offsets-aarch-linux-gnu.h $(MonoCrossDir)/usr/lib/gcc/aarch64-linux-gnu/7 + $(MonoCrossDir)/usr/lib/gcc/aarch64-linux-gnu/5 -- 2.7.4