build tweaks for cfi

build/config/sanitizers/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/clang/clang.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 
@@ skipping 139 matching lines @@
     if (is_ubsan_null) {
       ldflags += [ "-fsanitize=null" ]
     }
     if (is_ubsan_vptr) {
       ldflags += [ "-fsanitize=vptr" ]
     }
 
     if (is_cfi && !is_nacl) {
       ldflags += [
         "-fsanitize=cfi-vcall",
-        "-fsanitize=cfi-derived-cast",
-        "-fsanitize=cfi-unrelated-cast",
       ]
+      if (use_cfi_cast) {
+        ldflags += [
+          "-fsanitize=cfi-derived-cast",
+          "-fsanitize=cfi-unrelated-cast",
+        ]
+      }
       if (use_cfi_diag) {
         ldflags += [
           "-fno-sanitize-trap=cfi",
           "-fsanitize-recover=cfi",
         ]
       }
     }
   }
 }
 
@@ skipping 75 matching lines @@
   }
 }
 
 config("cfi_flags") {
   cflags = []
   if (is_cfi && !is_nacl) {
     cfi_blacklist_path =
         rebase_path("//tools/cfi/blacklist.txt", root_build_dir)
     cflags += [
       "-fsanitize=cfi-vcall",
-      "-fsanitize=cfi-derived-cast",
-      "-fsanitize=cfi-unrelated-cast",
+    ]
+    if (use_cfi_cast) {
+      cflags += [
+        "-fsanitize=cfi-derived-cast",
+        "-fsanitize=cfi-unrelated-cast",
+      ]
+    }
+    cflags += [
       "-fsanitize-blacklist=$cfi_blacklist_path",
     ]
 
     if (use_cfi_diag) {
       cflags += [
         "-fno-sanitize-trap=cfi",
         "-fsanitize-recover=cfi",
         "-fno-inline-functions",
         "-fno-inline",
         "-fno-omit-frame-pointer",
@@ skipping 163 matching lines @@
 # This allows to selectively disable ubsan_vptr, when needed. In particular,
 # if some third_party code is required to be compiled without rtti, which
 # is a requirement for ubsan_vptr.
 config("default_sanitizer_flags_but_ubsan_vptr") {
   configs = all_sanitizer_configs - [ ":ubsan_vptr_flags" ]
 }
 
 config("default_sanitizer_flags_but_coverage") {
   configs = all_sanitizer_configs - [ ":coverage_flags" ]
 }