Skip to content

Commit 139cc15

Browse files
joanna-lee-0jkotasjkoritzinsky
authored
Fix windows build (#122574)
Co-authored-by: Jan Kotas <[email protected]> Co-authored-by: Jeremy Koritzinsky <[email protected]>
1 parent bfa0708 commit 139cc15

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

src/coreclr/interpreter/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ if(CLR_CMAKE_HOST_WIN32)
2020
${STATIC_MT_CRT_LIB}
2121
${STATIC_MT_VCRT_LIB}
2222
)
23+
list(APPEND INTERPRETER_SOURCES
24+
Native.rc
25+
)
26+
add_definitions(-DFX_VER_INTERNALNAME_STR=clrinterpreter.dll)
2327
endif()
2428

2529
if(CLR_CMAKE_HOST_WIN32)

src/coreclr/interpreter/Native.rc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
#define FX_VER_FILEDESCRIPTION_STR ".NET Runtime Interpreter"
5+
6+
#include <fxver.h>
7+
#include <fxver.rc>

src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@
121121
<PlatformManifestFileEntry Condition="'$(PgoInstrument)' != ''" Include="clrjit.pgd" IsNative="true" />
122122
<PlatformManifestFileEntry Include="libclrjit.so" IsNative="true" />
123123
<PlatformManifestFileEntry Include="libclrjit.dylib" IsNative="true" />
124+
<PlatformManifestFileEntry Condition="('$(RuntimeConfiguration)' == 'Debug' or '$(RuntimeConfiguration)' == 'Checked') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')" Include="clrinterpreter.dll" IsNative="true" />
124125
<PlatformManifestFileEntry Condition="('$(RuntimeConfiguration)' == 'Debug' or '$(RuntimeConfiguration)' == 'Checked') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'riscv64')" Include="libclrinterpreter.so" IsNative="true" />
125-
<PlatformManifestFileEntry Condition="('$(RuntimeConfiguration)' == 'Debug' or '$(RuntimeConfiguration)' == 'Checked') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'riscv64')" Include="libclrinterpreter.dylib" IsNative="true" />
126+
<PlatformManifestFileEntry Condition="('$(RuntimeConfiguration)' == 'Debug' or '$(RuntimeConfiguration)' == 'Checked') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')" Include="libclrinterpreter.dylib" IsNative="true" />
126127
<PlatformManifestFileEntry Include="mscordaccore.dll" IsNative="true" />
127128
<PlatformManifestFileEntry Include="libmscordaccore.so" IsNative="true" />
128129
<PlatformManifestFileEntry Include="libmscordaccore.dylib" IsNative="true" />

0 commit comments

Comments
 (0)