Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MacOS createdump and createdump cleanup. #37224

Merged
merged 6 commits into from
Jun 3, 2020
Merged

MacOS createdump and createdump cleanup. #37224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
63ed4bd
General createdump cleanup.
May 31, 2020
5d34691
MacOS createdump
May 31, 2020
0a0a70e
Fix build
May 31, 2020
8f5b4a3
Code review feedback
Jun 2, 2020
6e1588b
Enabled crash/unhandled exception createdump trigger.
Jun 2, 2020
49f2f49
Code review feedback
Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/coreclr/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ endif(CLR_CMAKE_TARGET_WIN32 AND FEATURE_EVENT_TRACE)
add_subdirectory(debug/dbgutil)

if(CLR_CMAKE_HOST_UNIX)
if(CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86 AND NOT CLR_CMAKE_HOST_ANDROID)
if(CLR_CMAKE_HOST_OSX OR (CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86 AND NOT CLR_CMAKE_HOST_ANDROID))
add_subdirectory(debug/createdump)
endif(CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86 AND NOT CLR_CMAKE_HOST_ANDROID)
endif(CLR_CMAKE_HOST_OSX OR (CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86 AND NOT CLR_CMAKE_HOST_ANDROID))

# Include the dummy c++ include files
include_directories("pal/inc/rt/cpp")
Expand Down
18 changes: 13 additions & 5 deletions src/coreclr/src/debug/createdump/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ project(createdump)
set(CMAKE_INCLUDE_CURRENT_DIR ON)

include_directories(BEFORE ${VM_DIR})
if(CLR_CMAKE_HOST_OSX)
include_directories(${CLR_DIR}/src/inc/llvm)
endif(CLR_CMAKE_HOST_OSX)

remove_definitions(-DUNICODE)
remove_definitions(-D_UNICODE)
Expand Down Expand Up @@ -45,26 +48,31 @@ else(CLR_CMAKE_HOST_WIN32)
add_definitions(-DPAL_STDCPP_COMPAT)

set(CREATEDUMP_SOURCES
main.cpp
createdump.cpp
crashinfo.cpp
threadinfo.cpp
datatarget.cpp
dumpwriter.cpp
)

_add_library(createdump_lib
if(CLR_CMAKE_HOST_OSX)
_add_executable(createdump
crashinfomac.cpp
threadinfomac.cpp
${CREATEDUMP_SOURCES}
)

else()
_add_executable(createdump
main.cpp
crashinfounix.cpp
threadinfounix.cpp
${CREATEDUMP_SOURCES}
${PAL_REDEFINES_FILE}
)

add_dependencies(createdump pal_redefines_file)
endif(CLR_CMAKE_HOST_OSX)

target_link_libraries(createdump
createdump_lib
corguids
dbgutil
# share the PAL in the dac module
Expand Down
Loading