diff options
| author | pcc <pcc@chromium.org> | 2015-11-11 14:56:01 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-11 22:57:38 +0000 |
| commit | aca5d9e1d9c5ceedb4e35d3747f8b00d5b08289f (patch) | |
| tree | 63308a988fc4edccad59687a29edae892dcf85ac /build | |
| parent | 44ed74b06b9fea2adc752335a3e8f27f5d5b62ec (diff) | |
| download | chromium_src-aca5d9e1d9c5ceedb4e35d3747f8b00d5b08289f.zip chromium_src-aca5d9e1d9c5ceedb4e35d3747f8b00d5b08289f.tar.gz chromium_src-aca5d9e1d9c5ceedb4e35d3747f8b00d5b08289f.tar.bz2 | |
build: Downgrade LLVM LTO optimization level to 1 in official builds.
The current setting (2) is too slow. This does not affect any existing
production builds.
BUG=542426
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/1435753002
Cr-Commit-Position: refs/heads/master@{#359180}
Diffstat (limited to 'build')
| -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 |