diff options
Diffstat (limited to 'chromium/build/config/arm.gni')
| -rw-r--r-- | chromium/build/config/arm.gni | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/build/config/arm.gni b/chromium/build/config/arm.gni index 3cd6d87cbf6..10295c2c001 100644 --- a/chromium/build/config/arm.gni +++ b/chromium/build/config/arm.gni @@ -4,6 +4,7 @@ import("//build/config/chromeos/ui_mode.gni") import("//build/config/v8_target_cpu.gni") +import("//ui/qt/qt.gni") # These are primarily relevant in current_cpu == "arm" contexts, where # ARM code is being compiled. But they can also be relevant in the @@ -140,7 +141,7 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") { arm_control_flow_integrity = "standard" # TODO(cavalcantii): enable the feature for the following OSes next. - if (is_mac || is_chromeos || is_fuchsia || is_win || + if (is_mac || is_chromeos || is_fuchsia || is_win || use_qt || target_cpu != "arm64") { # target_cpu != "arm64" covers some cases (e.g. the ChromeOS x64 MSAN # build) where the target platform is x64, but V8 is configured to use |