Skip to content

Only build cdac-build-tool when we need to build runtime #109719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 5, 2024

Conversation

MichalStrehovsky
Copy link
Member

Related to #109718.

Copy link
Contributor

Tagging subscribers to this area: @hoyosjs
See info in area-owners.md if you want to be subscribed.

@@ -14,7 +14,7 @@
<Import Project="$(RepositoryEngineeringDir)nativepgo.targets" />

<ItemGroup>
<ProjectReference Include="tools\cdac-build-tool\cdac-build-tool.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Condition="'$(ClrRuntimeSubset)' == 'true'" Include="tools\cdac-build-tool\cdac-build-tool.csproj" ReferenceOutputAssembly="false" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are still some twists and turns in subset mappings to get these right but we can use this, otherwise unused, property:

Suggested change
<ProjectReference Condition="'$(ClrRuntimeSubset)' == 'true'" Include="tools\cdac-build-tool\cdac-build-tool.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Condition="'$(ClrDefaultRuntimeBuildSubsets)' != ''" Include="tools\cdac-build-tool\cdac-build-tool.csproj" ReferenceOutputAssembly="false" />

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What would this do? From my reading we set ClrDefaultRuntimeBuildSubsets unconditionally. I'm mostly trying to avoid building this for build.sh clr.iltools which is what ILLinker testing needs and doesn't need cdac-build-tool (but currently builds it).

Co-authored-by: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
@MichalStrehovsky MichalStrehovsky merged commit df1eaf9 into dotnet:main Dec 5, 2024
84 of 88 checks passed
@MichalStrehovsky MichalStrehovsky deleted the cdacbuildtool branch December 5, 2024 05:38
@github-actions github-actions bot locked and limited conversation to collaborators Jan 4, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants