diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 61c689b6d0..c9a75e521a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,7 @@ else (WIN32) # Ensure that objcopy is present if (DEFINED ENV{CROSSCOMPILE} AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) if (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) - find_program(OBJCOPY ${TOOLCHAIN}-objcopy) + find_program(OBJCOPY ${TOOLCHAIN_PREFIX}objcopy) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686) find_program(OBJCOPY objcopy) else() @@ -129,7 +129,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) set(CLR_CMAKE_PLATFORM_UNIX 1) if(CLR_CROSS_COMPONENTS_BUILD) # CMAKE_HOST_SYSTEM_PROCESSOR returns the value of `uname -p` on host. - if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64) + if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL amd64) if(CLR_CMAKE_TARGET_ARCH STREQUAL "arm") set(CLR_CMAKE_PLATFORM_UNIX_X86 1) else() @@ -544,17 +544,15 @@ include(pgosupport.cmake) # - project which require platform header not clr's # - do not depend on clr's compile definitions #----------------------------------------- -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_PLATFORM_UNIX AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) add_subdirectory(src/corefx) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif() if(CLR_CMAKE_PLATFORM_UNIX) - add_subdirectory(src/ToolBox/SOS/lldbplugin) - if(NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) + add_subdirectory(src/ToolBox/SOS/lldbplugin) add_subdirectory(src/pal) - endif(NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) - add_subdirectory(src/coreclr/hosts) - add_subdirectory(src/ildasm/unixcoreclrloader) + add_subdirectory(src/coreclr/hosts) + add_subdirectory(src/ildasm/unixcoreclrloader) endif(CLR_CMAKE_PLATFORM_UNIX) # Add this subdir. We install the headers for the jit. @@ -581,6 +579,14 @@ endif(WIN32) include_directories("src/pal/prebuilt/inc") include_directories("bin/obj") +if(FEATURE_STANDALONE_GC) + add_definitions(-DFEATURE_STANDALONE_GC) + + if(CLR_CMAKE_PLATFORM_UNIX) + add_subdirectory(src/gc/unix) + endif(CLR_CMAKE_PLATFORM_UNIX) +endif(FEATURE_STANDALONE_GC) + if (CLR_CMAKE_PLATFORM_UNIX) include_directories("src/pal/inc") include_directories("src/pal/inc/rt") |