diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-02-14 13:09:01 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2019-02-15 10:23:58 +0000 |
| commit | bb8520a5b4a49085e38b70cb4c95baf75ea374e9 (patch) | |
| tree | 073474e7e2f85c2f2d88650d818b16c2366ab60a | |
| parent | af22534f279006f353ff9f24dad57aed291d98bd (diff) | |
| download | qtwebengine-chromium-bb8520a5b4a49085e38b70cb4c95baf75ea374e9.tar.gz | |
Fix build with sanitizer and icecc
Do not use blacklist.txt file for asan, icecc does not
handle it properly, moreover the file is empty anyway.
Change-Id: I8d53ef27ef688cda464ca1278d7c9673ec74b58a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/build/config/sanitizers/BUILD.gn | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/build/config/sanitizers/BUILD.gn b/chromium/build/config/sanitizers/BUILD.gn index debc64cf409..ed3826495b7 100644 --- a/chromium/build/config/sanitizers/BUILD.gn +++ b/chromium/build/config/sanitizers/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/chromecast_build.gni") import("//build/config/clang/clang.gni") import("//build/config/sanitizers/sanitizers.gni") import("//build/toolchain/toolchain.gni") +import("//build/config/features.gni") if (is_ios) { import("//build/config/ios/ios_sdk.gni") @@ -304,7 +305,7 @@ config("asan_flags") { rebase_path("//tools/memory/asan/blacklist_win.txt", root_build_dir) } cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ] - } else { + } else if(!use_qt) { # TODO(rnk): Remove this as discussed in http://crbug.com/427202. if (!defined(asan_blacklist_path)) { asan_blacklist_path = |