From b079d1ac8544684c52177be4e1daf90f9763479c Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Thu, 19 Feb 2015 16:52:13 -0800 Subject: Fixed Windows build for the DAC by restore the lib order back. Add the MAKEDLLNAME macros to properly format the "sos" and "mscoredaccore" library names when loaded. Cleaned up the sos command to only load the sos module once the first time the command is executed. Fixed a g_clrData ref count bug in LoadClrDebugDll. --- src/dlls/mscordac/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/dlls') diff --git a/src/dlls/mscordac/CMakeLists.txt b/src/dlls/mscordac/CMakeLists.txt index 10f7161c32..fc0836f528 100644 --- a/src/dlls/mscordac/CMakeLists.txt +++ b/src/dlls/mscordac/CMakeLists.txt @@ -47,17 +47,17 @@ add_library(mscordaccore SHARED ${CLR_DAC_SOURCES}) # library. set(COREDAC_LIBRARIES ${START_LIBRARY_GROUP} # Start group of libraries that have circular references - utilcode_dac - cordbee_dac cee_dac - mdcompiler_dac - mdruntime_dac - mdruntimerw_dac - mdhotdata_dac + cordbee_dac corguids daccess dbgutil + mdcompiler_dac + mdhotdata_dac + mdruntime_dac + mdruntimerw_dac strongname_dac + utilcode_dac unwinder_dac ${END_LIBRARY_GROUP} # End group of libraries that have circular references ) -- cgit v1.2.3