summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-build_config_sanitizers_sanitizers.gni')
-rw-r--r--www/chromium/files/patch-build_config_sanitizers_sanitizers.gni9
1 files changed, 4 insertions, 5 deletions
diff --git a/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni b/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni
index 06d9149331ec..87b670525193 100644
--- a/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni
+++ b/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni
@@ -1,14 +1,13 @@
---- build/config/sanitizers/sanitizers.gni.orig 2017-01-26 00:49:07 UTC
+--- build/config/sanitizers/sanitizers.gni.orig 2017-03-09 20:04:27 UTC
+++ build/config/sanitizers/sanitizers.gni
-@@ -54,8 +54,9 @@ declare_args() {
+@@ -54,8 +54,8 @@ declare_args() {
# See http://clang.llvm.org/docs/ControlFlowIntegrity.html
#
# TODO(pcc): Remove this flag if/when CFI is enabled in all official builds.
- is_cfi = target_os == "linux" && !is_chromeos && target_cpu == "x64" &&
-- is_chrome_branded && is_official_build && allow_posix_link_time_opt
+- is_official_build && allow_posix_link_time_opt
+ is_cfi = (target_os == "linux" || target_os == "bsd") && !is_chromeos &&
-+ target_cpu == "x64" && is_chrome_branded && is_official_build &&
-+ allow_posix_link_time_opt
++ target_cpu == "x64" && is_official_build && allow_posix_link_time_opt
# Enable checks for bad casts: derived cast and unrelated cast.
# TODO(krasin): remove this, when we're ready to add these checks by default.