Fix long name cross arch DAC (#1948)
authorMike McLaughlin <mikem@microsoft.com>
Wed, 22 Jan 2020 00:38:26 +0000 (16:38 -0800)
committerGitHub <noreply@github.com>
Wed, 22 Jan 2020 00:38:26 +0000 (16:38 -0800)
src/coreclr/src/dlls/mscordac/CMakeLists.txt

index b663e29..544661f 100644 (file)
@@ -185,11 +185,14 @@ target_link_libraries(mscordaccore PRIVATE ${COREDAC_LIBRARIES})
 # add the install targets
 install_clr(TARGETS mscordaccore)
 install_clr(TARGETS mscordaccore DESTINATION sharedFramework SKIP_STRIP)
+
 if(WIN32)
     set(LONG_NAME_HOST_ARCH ${CLR_CMAKE_HOST_ARCH})
     set(LONG_NAME_TARGET_ARCH ${CLR_CMAKE_TARGET_ARCH})
-    if (CLR_CMAKE_HOST_ARCH_AMD64)
+    if (LONG_NAME_HOST_ARCH STREQUAL x64)
         set(LONG_NAME_HOST_ARCH "amd64")
+    endif()
+    if (LONG_NAME_TARGET_ARCH STREQUAL x64)
         set(LONG_NAME_TARGET_ARCH "amd64")
     endif()
     set(NATIVE_VERSION_HEADER_FILE "${CLR_DIR}/../../artifacts/obj/coreclr/_version.h")