Skip to content

Commit 483dec6

Browse files
lambdageekam11
andcommitted
Use DOTNET_HOST_PATH to run cdac-build-tool, when available
Related to dotnet/installer#19534 (comment) Co-Authored-By: Adeel Mujahid <3840695+am11@users.noreply.github.com>
1 parent 66c1fc6 commit 483dec6

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/coreclr/debug/runtimeinfo/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ else()
7575
add_custom_command(
7676
OUTPUT "${CONTRACT_DESCRIPTOR_OUTPUT}"
7777
VERBATIM
78-
COMMAND dotnet ${CDAC_BUILD_TOOL_BINARY_PATH} compose -o "${CONTRACT_DESCRIPTOR_OUTPUT}" -c "${CONTRACT_FILE}" $<TARGET_OBJECTS:cdac_data_descriptor>
78+
COMMAND ${CLR_DOTNET_HOST_PATH} ${CDAC_BUILD_TOOL_BINARY_PATH} compose -o "${CONTRACT_DESCRIPTOR_OUTPUT}" -c "${CONTRACT_FILE}" $<TARGET_OBJECTS:cdac_data_descriptor>
7979
DEPENDS cdac_data_descriptor cee_wks_core $<TARGET_OBJECTS:cdac_data_descriptor> "${CONTRACT_FILE}"
8080
USES_TERMINAL
8181
)

src/coreclr/runtime.proj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
<_CoreClrBuildArg Condition="'$(HostCrossOS)' != ''" Include="-hostos $(HostCrossOS)" />
5151
<_CoreClrBuildArg Include="-outputrid $(OutputRID)" />
5252
<_CoreClrBuildArg Condition="'$(BuildSubdirectory)' != ''" Include="-subdir $(BuildSubdirectory)" />
53+
<_CoreClrBuildArg Include="-cmakeargs &quot;-DCLR_DOTNET_HOST_PATH=$(DOTNET_HOST_PATH)&quot;" Condition="'$(DOTNET_HOST_PATH)' != ''" />
54+
<_CoreClrBuildArg Include="-cmakeargs -DCLR_DOTNET_HOST_PATH=dotnet" Condition="'$(DOTNET_HOST_PATH)' == ''" />
5355
<_CoreClrBuildArg Include="-cmakeargs &quot;-DCDAC_BUILD_TOOL_BINARY_PATH=$(RuntimeBinDir)cdac-build-tool\cdac-build-tool.dll&quot;" />
5456
</ItemGroup>
5557

0 commit comments

Comments
 (0)