diff options
author | David Wrighton <davidwr@microsoft.com> | 2017-09-13 14:50:39 -0700 |
---|---|---|
committer | David Wrighton <davidwr@microsoft.com> | 2017-09-13 14:50:39 -0700 |
commit | d68f0916d0a2bf3787bc85261ef4a4f1f27f1f24 (patch) | |
tree | 6c21ac239ae268096f20d98a8db16a4b80394fd9 /CMakeLists.txt | |
parent | 96fa98525e0d64459148228cde5211c475b0c25c (diff) | |
parent | e866d072042f4ad9e0811aa36e338dac781c09a5 (diff) | |
download | coreclr-d68f0916d0a2bf3787bc85261ef4a4f1f27f1f24.tar.gz coreclr-d68f0916d0a2bf3787bc85261ef4a4f1f27f1f24.tar.bz2 coreclr-d68f0916d0a2bf3787bc85261ef4a4f1f27f1f24.zip |
Merge branch 'master' into update_from_master
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ff21c69f43..9b24a77e90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,6 +92,11 @@ else (WIN32) if (AWK STREQUAL "AWK-NOTFOUND") message(FATAL_ERROR "AWK not found") endif() + + # Try to locate the paxctl tool. Failure to find it is not fatal, + # but the generated executables won't work on a system where PAX is set + # to prevent applications to create executable memory mappings. + find_program(PAXCTL paxctl) if (CMAKE_SYSTEM_NAME STREQUAL Darwin) @@ -579,6 +584,13 @@ if(WIN32) add_compile_options(/Zl) # omit default library name in .OBJ endif(WIN32) +#-------------------------------- +# Definition directives +# - all clr specific compile definitions should be included in this file +# - all clr specific feature variable should also be added in this file +#---------------------------------- +include(clrdefinitions.cmake) + #------------------------------------- # Include directory directives #------------------------------------- @@ -588,10 +600,7 @@ 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) + add_subdirectory(src/gc) endif(FEATURE_STANDALONE_GC) if(FEATURE_STANDALONE_GC_ONLY) @@ -604,13 +613,6 @@ if (CLR_CMAKE_PLATFORM_UNIX) include_directories("src/pal/src/safecrt") endif (CLR_CMAKE_PLATFORM_UNIX) -#-------------------------------- -# Definition directives -# - all clr specific compile definitions should be included in this file -# - all clr specific feature variable should also be added in this file -#---------------------------------- -include(clrdefinitions.cmake) - # Microsoft.Dotnet.BuildTools.Coreclr version set(BuildToolsVersion "1.0.4-prerelease") set(BuildToolsDir "${CLR_DIR}/packages/Microsoft.DotNet.BuildTools.CoreCLR/${BuildToolsVersion}") |