From 1789d9e955d5cd5da6afe43d0fd1621d3ac92592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 4 Apr 2024 17:57:33 +0900 Subject: [PATCH] Fix official build break (#100624) #100512 caused an official build break by exposing a latent issue in how we build the managed artifacts. Official builds split managed and native builds for some reason. This is throwing off the heuristic that decides whether to use native AOT's corelib in build. We were always using the native AOT's corelib in x64 and arm64 legs because of the thrown off heuristic. This apparently didn't cause an immediate problem there. It causes a problem on x86 because crossgen2 is a trimmed+r2r+singlefile executable on x86 (and nowhere else) and ILLink execution doesn't like the layouts with `UseNativeAotCoreLib`. Tweak the heuristic to not use native AOT corelib if we're building JIT corelib. --- eng/Subsets.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index cbe9cfc7d73c99..63aca146463a5e 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -124,7 +124,7 @@ true - true + true