Skip to content

Trim unused CoreCLR native components from dotnet-linker-tests build #131666

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.

Sign up for GitHub

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

Open
sbomer wants to merge 3 commits into
base: main
Choose a base branch
from
+16 −1
Open

Trim unused CoreCLR native components from dotnet-linker-tests build #131666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b88ec99
Trim unused CoreCLR native components from dotnet-linker-tests build
sbomer Jul 31, 2026
c9cf637
Potential fix for pull request finding
sbomer Jul 31, 2026
e6f7a7e
Install the target-specific JIT into the jit component on Windows
sbomer Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion eng/pipelines/runtime-linker-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,11 @@ extends:
or(
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
eq(variables['isRollingBuild'], true))
buildArgs: -s clr+libs+tools.illink+host.native -c $(_BuildConfig) /p:ToolsConfiguration=Debug
# This replaces the previous `clr` subset (which expands to `clr.native` and builds every native component)
# with a narrower CoreCLR subset list that the trimming/NativeAOT tests need.
# Most notably it drops `alljits` (cross-target alt-JITs) and `spmi` (SuperPMI and shims),
# none of which these tests use.
buildArgs: -s clr.runtime+clr.nativeaotruntime+clr.corelib+clr.tools+clr.nativecorelib+clr.nativeaotlibs+libs+tools.illink+host.native -c $(_BuildConfig) /p:ToolsConfiguration=Debug
postBuildSteps:
- template: /eng/pipelines/libraries/execute-trimming-tests-steps.yml
parameters:
Expand Down
11 changes: 11 additions & 0 deletions src/coreclr/jit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,17 @@ if (CLR_CMAKE_TARGET_UNIX)
endif()
endif()

# crossgen2 and ILC load the target-specific JIT (e.g. clrjit_win_x64_x64) rather than clrjit,
# so it has to be part of the jit component for a build that only requests that component to be
# able to run them. This mirrors what the block above already does for Unix targets.
if (CLR_CMAKE_TARGET_WIN32)
if(CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_ARM64)
install_clr(TARGETS clrjit_universal_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME} DESTINATIONS . COMPONENT jit)
else()
install_clr(TARGETS clrjit_win_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME} DESTINATIONS . COMPONENT jit)
endif()
endif()

if (CLR_CMAKE_TARGET_WIN32 AND CLR_CMAKE_PGO_INSTRUMENT)
# Copy PGO dependency to target dir
set(PGORT_DLL "pgort140.dll")
Expand Down
Loading