diff options
-rw-r--r-- | configurecompiler.cmake | 11 | ||||
-rwxr-xr-x | packaging/coreclr.spec | 4 |
2 files changed, 1 insertions, 14 deletions
diff --git a/configurecompiler.cmake b/configurecompiler.cmake index 423bb40129..eb817ef6b1 100644 --- a/configurecompiler.cmake +++ b/configurecompiler.cmake @@ -300,17 +300,6 @@ elseif (CLR_CMAKE_PLATFORM_UNIX) message(FATAL_ERROR "Unknown build type! Set CMAKE_BUILD_TYPE to DEBUG, CHECKED, RELEASE, or RELWITHDEBINFO!") endif () - if(DEFINED ENV{TIZEN_ASAN_ENVIRONMENT}) - if (CLR_CMAKE_PLATFORM_UNIX_ARM OR CLR_CMAKE_PLATFORM_UNIX_AMD64) - message(STATUS "TIZEN_ASAN_ENVIRONMENT is enabled.") - # add definitions to enable ASan support for only external libraries (supported only Tizen) - add_definitions(-DTIZEN_ASAN_ENVIRONMENT -DHAS_ADDRESS_SANITIZER) - set(TIZEN_ASAN_ENVIRONMENT 1) - else() - message(STATUS "TIZEN_ASAN_ENVIRONMENT cannot be enabled. Current arch is not supported.") - endif() - endif() - # set the CLANG sanitizer flags for debug build if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED) # obtain settings from running enablesanitizers.sh diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec index 7c7abcdc47..ef9001cf4f 100755 --- a/packaging/coreclr.spec +++ b/packaging/coreclr.spec @@ -148,9 +148,7 @@ done export ASAN_OPTIONS=use_sigaltstack=false:`cat /ASAN_OPTIONS` /usr/bin/gcc-unforce-options export LD_LIBRARY_PATH=`pwd`/libicu-57.1 - -# enable ASan support for only external libs -export TIZEN_ASAN_ENVIRONMENT=1 +export CPPFLAGS+=" -DHAS_ADDRESS_SANITIZER " } export CFLAGS=" --target=%{_host} " |