diff options
| author | Mike McLaughlin <mikem@microsoft.com> | 2015-03-06 14:22:26 -0800 |
|---|---|---|
| committer | Mike McLaughlin <mikem@microsoft.com> | 2015-03-06 14:33:18 -0800 |
| commit | 0d2dfa00f7fa2f2d31389d001cefe3cbfa2cfd9b (patch) | |
| tree | b0eee1c1c344f0c35512ce14f2f1f461e0d39111 /src/ToolBox | |
| parent | c3a5f9be4d0d3247070759db911426d72f862df3 (diff) | |
| download | coreclr-0d2dfa00f7fa2f2d31389d001cefe3cbfa2cfd9b.tar.gz coreclr-0d2dfa00f7fa2f2d31389d001cefe3cbfa2cfd9b.tar.bz2 coreclr-0d2dfa00f7fa2f2d31389d001cefe3cbfa2cfd9b.zip | |
Fix the LLDB.h search order and the format character used.
Diffstat (limited to 'src/ToolBox')
| -rw-r--r-- | src/ToolBox/SOS/Strike/util.cpp | 4 | ||||
| -rw-r--r-- | src/ToolBox/SOS/lldbplugin/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ToolBox/SOS/Strike/util.cpp b/src/ToolBox/SOS/Strike/util.cpp index 7adba2f960..8e9a0d9615 100644 --- a/src/ToolBox/SOS/Strike/util.cpp +++ b/src/ToolBox/SOS/Strike/util.cpp @@ -3334,7 +3334,7 @@ void DumpMDInfoFromMethodDescData(DacpMethodDescData * pMethodDescData, DacpReJi if (!fStackTraceFormat) { - ExtOut("Method Name: %ls\n", wszNameBuffer); + ExtOut("Method Name: %S\n", wszNameBuffer); DacpMethodTableData mtdata; if (SUCCEEDED(mtdata.Request(g_sos, pMethodDescData->MethodTablePtr))) @@ -3360,7 +3360,7 @@ void DumpMDInfoFromMethodDescData(DacpMethodDescData * pMethodDescData, DacpReJi { if (!bFailed) { - ExtOut("%ls", wszNameBuffer); + ExtOut("%S", wszNameBuffer); } else { diff --git a/src/ToolBox/SOS/lldbplugin/CMakeLists.txt b/src/ToolBox/SOS/lldbplugin/CMakeLists.txt index e07e5f3f16..06061e68d9 100644 --- a/src/ToolBox/SOS/lldbplugin/CMakeLists.txt +++ b/src/ToolBox/SOS/lldbplugin/CMakeLists.txt @@ -28,9 +28,9 @@ message(STATUS "LLDB: ${LLDB}") # Check for LLDB headers find_path(LLDB_H "lldb/API/LLDB.h" PATHS "${WITH_LLDB_INCLUDES}") if(LLDB_H STREQUAL LLDB_H-NOTFOUND) - find_path(LLDB_H "lldb/API/LLDB.h" PATHS "/usr/lib/llvm-3.5/include") + find_path(LLDB_H "lldb/API/LLDB.h" PATHS "/usr/lib/llvm-3.6/include") if(LLDB_H STREQUAL LLDB_H-NOTFOUND) - find_path(LLDB_H "lldb/API/LLDB.h" PATHS "/usr/lib/llvm-3.6/include") + find_path(LLDB_H "lldb/API/LLDB.h" PATHS "/usr/lib/llvm-3.5/include") if(LLDB_H STREQUAL LLDB_H-NOTFOUND) if(REQUIRE_LLDBPLUGIN) message(FATAL_ERROR "Cannot find LLDB.h. Try installing lldb-3.6-dev (or the appropriate package for your platform)") |