diff options
Diffstat (limited to 'www/chromium/files/patch-build_config_sanitizers_BUILD.gn')
| -rw-r--r-- | www/chromium/files/patch-build_config_sanitizers_BUILD.gn | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/chromium/files/patch-build_config_sanitizers_BUILD.gn b/www/chromium/files/patch-build_config_sanitizers_BUILD.gn index d67a5f3089aa..448378244b45 100644 --- a/www/chromium/files/patch-build_config_sanitizers_BUILD.gn +++ b/www/chromium/files/patch-build_config_sanitizers_BUILD.gn @@ -1,20 +1,20 @@ ---- build/config/sanitizers/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/sanitizers/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/sanitizers/BUILD.gn -@@ -405,7 +405,7 @@ config("lsan_flags") { +@@ -420,7 +420,7 @@ config("lsan_flags") { config("msan_flags") { if (is_msan) { - assert(is_linux, "msan only supported on linux x86_64") + assert(is_linux || is_bsd, "msan only supported on linux x86_64") - msan_blacklist_path = - rebase_path("//tools/msan/blacklist.txt", root_build_dir) - cflags = [ -@@ -418,7 +418,7 @@ config("msan_flags") { + if (!defined(msan_blacklist_path)) { + msan_blacklist_path = + rebase_path("//tools/msan/blacklist.txt", root_build_dir) +@@ -435,7 +435,7 @@ config("msan_flags") { config("tsan_flags") { if (is_tsan) { - assert(is_linux, "tsan only supported on linux x86_64") + assert(is_linux || is_bsd, "tsan only supported on linux x86_64") - tsan_blacklist_path = - rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir) - cflags = [ + if (!defined(tsan_blacklist_path)) { + tsan_blacklist_path = + rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir) |