Skip to content

Ignore CLR_DOTNET_RID when using stub cdac #114541

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

Merged
merged 3 commits into from
Apr 11, 2025
Merged

Ignore CLR_DOTNET_RID when using stub cdac #114541

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b80890
Ignore CLR_DOTNET_RID when using stub cdac
am11 Apr 11, 2025
b3e4143
Update compiler.h
am11 Apr 11, 2025
04ecc00
Undo dummy change
am11 Apr 11, 2025
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
2 changes: 1 addition & 1 deletion src/coreclr/debug/runtimeinfo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ install_clr(TARGETS runtimeinfo DESTINATIONS lib COMPONENT runtime)

# cDAC contract descriptor

if("${CLR_DOTNET_RID}" STREQUAL "")
if(CDAC_BUILD_TOOL_BINARY_PATH AND "${CLR_DOTNET_RID}" STREQUAL "")
message(FATAL_ERROR "CLR_DOTNET_RID is not set. Please ensure it is being set to the portable RID of the target platform by runtime.proj.")
endif()
configure_file(configure.h.in ${CMAKE_CURRENT_BINARY_DIR}/configure.h)
Expand Down