Fix Details for ILAsm/ILDasm/ClrJit Binaries

Fixes https://github.com/dotnet/coreclr/issues/5408

Commit migrated from https://github.com/dotnet/coreclr/commit/1bdc6eb40691b1fd0d19f5e137815d6bcfe359f5

diff --git a/src/coreclr/src/ilasm/CMakeLists.txt b/src/coreclr/src/ilasm/CMakeLists.txt
index f9c6ba9..34ec799 100644 (file)
--- a/src/coreclr/src/ilasm/CMakeLists.txt
+++ b/src/coreclr/src/ilasm/CMakeLists.txt
@@ -24,6 +24,11 @@ set(ILASM_SOURCES
   assembler.cpp
   prebuilt/asmparse.c
 )
+if(WIN32)
+  set(ILASM_RESOURCES Native.rc)
+  add_definitions(-DFX_VER_INTERNALNAME_STR=ilasm.exe)
+endif(WIN32)
+
 set_source_files_properties( prebuilt/asmparse.c PROPERTIES LANGUAGE CXX )
 
 if(CLR_CMAKE_PLATFORM_UNIX)
@@ -40,6 +45,7 @@ endif(CLR_CMAKE_PLATFORM_UNIX)
 
 _add_executable(ilasm
   ${ILASM_SOURCES}
+  ${ILASM_RESOURCES}
 )
 
 set(ILASM_LINK_LIBRARIES

diff --git a/src/coreclr/src/ildasm/exe/CMakeLists.txt b/src/coreclr/src/ildasm/exe/CMakeLists.txt
index 932c385..87cdd23 100644 (file)
--- a/src/coreclr/src/ildasm/exe/CMakeLists.txt
+++ b/src/coreclr/src/ildasm/exe/CMakeLists.txt
@@ -17,6 +17,9 @@ if(CLR_CMAKE_PLATFORM_UNIX)
     set(ILDASM_RESOURCES
         ${TARGET_CPP_FILE}
     )
+else()
+    set(ILDASM_RESOURCES ../dasm.rc)
+    add_definitions(-DFX_VER_INTERNALNAME_STR=ildasm.exe)
 endif(CLR_CMAKE_PLATFORM_UNIX)
 
 set(ILDASM_SOURCES

diff --git a/src/coreclr/src/ildasm/rcdll/CMakeLists.txt b/src/coreclr/src/ildasm/rcdll/CMakeLists.txt
index 93da34c..5fb49da 100644 (file)
--- a/src/coreclr/src/ildasm/rcdll/CMakeLists.txt
+++ b/src/coreclr/src/ildasm/rcdll/CMakeLists.txt
@@ -8,6 +8,8 @@ add_definitions(-D__ILDASM__)
 add_definitions(-DFEATURE_CORECLR)
 add_definitions(-DFX_VFT=VFT_DLL)
 
+add_definitions(-DFX_VER_INTERNALNAME_STR=ildasmrc.dll)
+
 set(ILDASM_RESOURCES
     ../dasm.rc
 )

diff --git a/src/coreclr/src/jit/CMakeLists.txt b/src/coreclr/src/jit/CMakeLists.txt
index 7f1a080..3e3bb50 100644 (file)
--- a/src/coreclr/src/jit/CMakeLists.txt
+++ b/src/coreclr/src/jit/CMakeLists.txt
@@ -15,6 +15,10 @@ if (ARM_SOFTFP)
   add_definitions(-DARM_SOFTFP)
 endif (ARM_SOFTFP)
 
+if(WIN32)
+  set(JIT_RESOURCES Native.rc)
+endif(WIN32)
+
 set( JIT_SOURCES
   alloc.cpp
   assertionprop.cpp
@@ -139,6 +143,7 @@ set( SOURCES
   ${JIT_SOURCES}
   ${ARCH_SOURCES}
   ${ARCH_LEGACY_SOURCES}
+  ${JIT_RESOURCES}
 )
 
 convert_to_absolute_path(SOURCES ${SOURCES})
@@ -191,6 +196,10 @@ if (CLR_BUILD_JIT32)
   set(JIT_BASE_NAME ryujit)
 endif()
 
+if(WIN32)
+  add_definitions(-DFX_VER_INTERNALNAME_STR=${JIT_BASE_NAME}.dll)
+endif(WIN32)
+
 add_subdirectory(dll)
 add_subdirectory(crossgen)
 add_subdirectory(standalone)