diff options
| -rw-r--r-- | build/common.gypi | 4 | ||||
| -rw-r--r-- | build/config/sanitizers/BUILD.gn | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/build/common.gypi b/build/common.gypi index 67fc8e5..a253ce6 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -6089,8 +6089,8 @@ ], }, }], - # Apply a lower LTO optimization level in non-official builds. - ['use_lto==1 and clang==1 and buildtype!="Official"', { + # Apply a lower LTO optimization level as the default is too slow. + ['use_lto==1 and clang==1', { 'target_defaults': { 'target_conditions': [ ['_toolset=="target"', { diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn index eb7ba4a..19d0a3f 100644 --- a/build/config/sanitizers/BUILD.gn +++ b/build/config/sanitizers/BUILD.gn @@ -183,13 +183,11 @@ config("default_sanitizer_flags") { "-fsanitize=cfi-unrelated-cast", ] - # Apply a lower LTO optimization level in non-official builds. - if (!is_official_build) { - if (is_linux) { - ldflags += [ "-Wl,-plugin-opt,O1" ] - } else if (is_mac) { - ldflags += [ "-Wl,-mllvm,-O1" ] - } + # Apply a lower LTO optimization level as the default is too slow. + if (is_linux) { + ldflags += [ "-Wl,-plugin-opt,O1" ] + } else if (is_mac) { + ldflags += [ "-Wl,-mllvm,-O1" ] } # Work-around for http://openradar.appspot.com/20356002 |