-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Remove unused files. * Rewrite corerun so that it runs on all platforms. Remove the unixcorerun implementation but fold in those its features. Attach debugger is supported on Windows and macOS. CORE_ROOT can now be set the same way on all platforms: --clr-path, CORE_ROOT, corerun dir. * Dump the computed configuration for runtime if a failure to initialize or execute the entry assembly occurs. Remove -v flag. * Add debugger attach support for systems with procfs. * Remove the corerun option for setting System.Globalization.Invariant.
- Loading branch information
1 parent
e62558a
commit 7b500a4
Showing
12 changed files
with
1,161 additions
and
1,782 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
include_directories(inc) | ||
|
||
if(CLR_CMAKE_HOST_WIN32) | ||
add_subdirectory(corerun) | ||
add_subdirectory(coreshim) | ||
else(CLR_CMAKE_HOST_WIN32) | ||
add_definitions(-D_FILE_OFFSET_BITS=64) | ||
add_subdirectory(unixcorerun) | ||
endif(CLR_CMAKE_HOST_WIN32) | ||
|
||
add_subdirectory(corerun) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,35 @@ | ||
project(CoreRun) | ||
project(corerun) | ||
|
||
set(CMAKE_INCLUDE_CURRENT_DIR ON) | ||
add_definitions(-DFX_VER_INTERNALNAME_STR=CoreRun.exe) | ||
|
||
_add_executable(CoreRun | ||
corerun.cpp logger.cpp | ||
if(CLR_CMAKE_HOST_WIN32) | ||
add_definitions(-DFX_VER_INTERNALNAME_STR=corerun.exe) | ||
else(CLR_CMAKE_HOST_WIN32) | ||
include_directories("${CLR_SRC_NATIVE_DIR}/common") | ||
include(configure.cmake) | ||
endif(CLR_CMAKE_HOST_WIN32) | ||
|
||
_add_executable(corerun | ||
corerun.cpp | ||
native.rc | ||
) | ||
|
||
target_link_libraries(CoreRun | ||
utilcodestaticnohost | ||
advapi32.lib | ||
oleaut32.lib | ||
uuid.lib | ||
user32.lib | ||
${STATIC_MT_CRT_LIB} | ||
${STATIC_MT_VCRT_LIB} | ||
) | ||
if(CLR_CMAKE_HOST_WIN32) | ||
target_link_libraries(corerun | ||
advapi32.lib | ||
oleaut32.lib | ||
uuid.lib | ||
user32.lib | ||
${STATIC_MT_CRT_LIB} | ||
${STATIC_MT_VCRT_LIB} | ||
) | ||
else(CLR_CMAKE_HOST_WIN32) | ||
target_link_libraries(corerun ${CMAKE_DL_LIBS}) | ||
|
||
# Android implements pthread natively | ||
if(NOT CLR_CMAKE_TARGET_ANDROID) | ||
target_link_libraries(corerun pthread) | ||
endif() | ||
endif(CLR_CMAKE_HOST_WIN32) | ||
|
||
install_clr(TARGETS CoreRun) | ||
install_clr(TARGETS corerun) |
File renamed without changes.
File renamed without changes.
Oops, something went wrong.