diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-03-03 18:10:26 -0800 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-03-04 09:24:34 -0800 |
| commit | f8dfa40dc21c01e4dc297aeb4a23db22d1830506 (patch) | |
| tree | 7faf98239420c59c61f9c29c0e8f60d2fad566fb /src/dlls | |
| parent | d31008b8ee2ad0303d90905188e50d3f6cd8e166 (diff) | |
| download | coreclr-f8dfa40dc21c01e4dc297aeb4a23db22d1830506.tar.gz coreclr-f8dfa40dc21c01e4dc297aeb4a23db22d1830506.tar.bz2 coreclr-f8dfa40dc21c01e4dc297aeb4a23db22d1830506.zip | |
Fixup CRT linkages for uCRT
Diffstat (limited to 'src/dlls')
| -rw-r--r-- | src/dlls/dbgshim/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/dlls/mscordac/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/dlls/mscordbi/CMakeLists.txt | 7 |
3 files changed, 23 insertions, 0 deletions
diff --git a/src/dlls/dbgshim/CMakeLists.txt b/src/dlls/dbgshim/CMakeLists.txt index 621ab134c7..655cb0a28b 100644 --- a/src/dlls/dbgshim/CMakeLists.txt +++ b/src/dlls/dbgshim/CMakeLists.txt @@ -52,6 +52,14 @@ if(WIN32) version.lib psapi.lib ) + + # ARM64_TODO: Enable this for Windows Arm64 + if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) + list(APPEND DBGSHIM_LIBRARIES + ${STATIC_MT_VCRT_LIB} + ) + endif() + else() list(APPEND DBGSHIM_LIBRARIES coreclrpal diff --git a/src/dlls/mscordac/CMakeLists.txt b/src/dlls/mscordac/CMakeLists.txt index 40704401b4..ea655e77b8 100644 --- a/src/dlls/mscordac/CMakeLists.txt +++ b/src/dlls/mscordac/CMakeLists.txt @@ -87,6 +87,14 @@ if(WIN32) user32.lib ${STATIC_MT_CRT_LIB} ) + + # ARM64_TODO: Enable this for Windows Arm64 + if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) + list(APPEND COREDAC_LIBRARIES + ${STATIC_MT_VCRT_LIB} + ) + endif() + else(WIN32) list(APPEND COREDAC_LIBRARIES mscorrc_debug diff --git a/src/dlls/mscordbi/CMakeLists.txt b/src/dlls/mscordbi/CMakeLists.txt index 050e51d858..0c8a685b76 100644 --- a/src/dlls/mscordbi/CMakeLists.txt +++ b/src/dlls/mscordbi/CMakeLists.txt @@ -63,6 +63,13 @@ if(WIN32) ${STATIC_MT_CRT_LIB} ) + # ARM64_TODO: Enable this for Windows Arm64 + if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) + list(APPEND COREDBI_LIBRARIES + ${STATIC_MT_VCRT_LIB} + ) + endif() + target_link_libraries(mscordbi ${COREDBI_LIBRARIES}) elseif(CLR_CMAKE_PLATFORM_UNIX) |