merge from dev

This commit is contained in:
daan 2019-11-07 11:00:50 -08:00
commit 6ccfb5a93e
2 changed files with 15 additions and 13 deletions

View file

@ -10,7 +10,7 @@ option(MI_SEE_ASM "Generate assembly files" OFF)
option(MI_CHECK_FULL "Use full internal invariant checking in DEBUG mode" OFF)
option(MI_USE_CXX "Use the C++ compiler to compile the library" OFF)
option(MI_SECURE "Use security mitigations (like guard pages and randomization)" OFF)
option(MI_SECURE_FULL "Use full security mitigations (like double free protection, more expensive)" OFF)
option(MI_SECURE_FULL "Use full security mitigations, may be more expensive (includes double-free mitigation)" OFF)
option(MI_LOCAL_DYNAMIC_TLS "Use slightly slower, dlopen-compatible TLS mechanism (Unix)" OFF)
option(MI_BUILD_TESTS "Build test executables" ON)
@ -72,8 +72,9 @@ if(MI_OVERRIDE MATCHES "ON")
endif()
if(MI_SECURE_FULL MATCHES "ON")
message(STATUS "Set full secure build (experimental) (MI_SECURE_FULL=ON)")
message(STATUS "Set full secure build (may be more expensive) (MI_SECURE_FULL=ON)")
list(APPEND mi_defines MI_SECURE=4)
set(MI_SECURE "ON")
else()
if(MI_SECURE MATCHES "ON")
message(STATUS "Set secure build (MI_SECURE=ON)")