Commit 6e7efb0c authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Migrate to OS_MAC and OS_APPLE in build

Bug: 1105907
Change-Id: I509290b67e64369e63a076097a8095347d38a957
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2324175
Commit-Queue: Avi Drissman <avi@chromium.org>
Auto-Submit: Avi Drissman <avi@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792756}
parent 578cd722
......@@ -48,7 +48,7 @@ const char kAsanDefaultOptions[] =
"fast_unwind_on_fatal=1 detect_stack_use_after_return=1 "
"symbolize=1 detect_leaks=0 allow_user_segv_handler=1 ";
#elif defined(OS_MACOSX)
#elif defined(OS_APPLE)
const char* kAsanDefaultOptions =
"check_printf=1 use_sigaltstack=1 strip_path_prefix=/../../ "
"fast_unwind_on_fatal=1 detect_stack_use_after_return=1 ";
......@@ -59,7 +59,7 @@ const char* kAsanDefaultOptions =
"fast_unwind_on_fatal=1 detect_stack_use_after_return=1 ";
#endif // OS_LINUX
#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
#if defined(OS_LINUX) || defined(OS_APPLE) || defined(OS_WIN)
// Allow NaCl to override the default asan options.
extern const char* kAsanDefaultOptionsNaCl;
__attribute__((weak)) const char* kAsanDefaultOptionsNaCl = nullptr;
......@@ -75,7 +75,7 @@ extern char kASanDefaultSuppressions[];
SANITIZER_HOOK_ATTRIBUTE const char *__asan_default_suppressions() {
return kASanDefaultSuppressions;
}
#endif // OS_LINUX || OS_MACOSX || OS_WIN
#endif // OS_LINUX || OS_APPLE || OS_WIN
#endif // ADDRESS_SANITIZER
#if defined(THREAD_SANITIZER) && defined(OS_LINUX)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment