Skip to content

Commit 4a321ae

Browse files
committed
Do not bundle the ILCompiler (NativeAOT) where unsupported (e.g. ppc64le)
Gate BundleNativeAotCompiler on the NativeAotSupported feature flag instead of attempting to bundle the ILCompiler/NativeAOT packs on RIDs that have no NativeAOT backend. eng/common/native/NativeAotSupported.props already excludes ppc64le (and s390x, wasm, and the unsupported OSes), so the source build no longer tries to restore the nonexistent freebsd-ppc64le ILCompiler packs.
1 parent be0fd8c commit 4a321ae

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

src/Layout/Directory.Build.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,12 @@
7474
)">true</SkipBuildingInstallers>
7575
</PropertyGroup>
7676

77+
<Import Project="$(RepositoryEngineeringDir)common\native\NativeAotSupported.props" />
78+
7779
<PropertyGroup>
7880
<GenerateSdkBundleOnly Condition="'$(DotNetBuildPass)' == '3' and '$(OS)' == 'Windows_NT'">true</GenerateSdkBundleOnly>
7981
<BundleRuntimePacks Condition="'$(BundleRuntimePacks)' == '' and '$(DotNetBuildSourceOnly)' == 'true'">true</BundleRuntimePacks>
80-
<BundleNativeAotCompiler Condition="'$(BundleNativeAotCompiler)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true'">true</BundleNativeAotCompiler>
82+
<BundleNativeAotCompiler Condition="'$(BundleNativeAotCompiler)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true' and '$(NativeAotSupported)' == 'true'">true</BundleNativeAotCompiler>
8183

8284
<!-- Crossgen2 is not bundled by default on platforms where Microsoft provides a package on nuget.org,
8385
because it is large (100MB+). -->

0 commit comments

Comments
 (0)