summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2017-02-06 19:29:36 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2017-02-06 19:29:36 +0000
commit8d28aa8db0c717bef863b7a7630f48cf3870ffb1 (patch)
treeae8b6c930932585d45e586480457898519baa1ce /www/chromium/files/patch-build_config_sanitizers_sanitizers.gni
parentUpgrade to 0.11.0 (diff)
www/chromium: update to 56.0.2924.87
- Use system FFmpeg instead of embedded code copy [1] - Disable PULSEAUDIO option [2] - Sort _DEPENDS variables - Regenerate patches with make makepatch PR: 215271 [1], 216327 [2] Reported by: jbeich [1] Approved by: rene MFH: 2017Q1 Security: https://vuxml.freebsd.org/freebsd/4b9ca994-e3d9-11e6-813d-e8e0b747a45a.html
Diffstat (limited to 'www/chromium/files/patch-build_config_sanitizers_sanitizers.gni')
-rw-r--r--www/chromium/files/patch-build_config_sanitizers_sanitizers.gni11
1 files changed, 6 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 d304c8a1b8ca..06d9149331ec 100644
--- a/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni
+++ b/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni
@@ -1,13 +1,14 @@
---- build/config/sanitizers/sanitizers.gni.orig 2016-10-06 04:02:08.000000000 +0300
-+++ build/config/sanitizers/sanitizers.gni 2016-10-24 22:57:06.565590000 +0300
-@@ -53,8 +53,8 @@
+--- build/config/sanitizers/sanitizers.gni.orig 2017-01-26 00:49:07 UTC
++++ build/config/sanitizers/sanitizers.gni
+@@ -54,8 +54,9 @@ 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
+- is_chrome_branded && 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
++ target_cpu == "x64" && is_chrome_branded && 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.