Linux: Fix startup hang on Ubuntu 16.04.4 (issue #2424)

This commit is contained in:
Marshall Greenblatt
2018-04-13 21:21:17 -04:00
parent 64d86a7397
commit 0677d0d9de
2 changed files with 13 additions and 0 deletions

View File

@@ -118,6 +118,7 @@ if (is_clang) {
}
if (is_linux) {
import("//build/config/linux/pkg_config.gni")
import("//third_party/fontconfig/fontconfig.gni")
}
if (is_mac) {
import("//build/config/mac/rules.gni")
@@ -148,6 +149,12 @@ if (is_clang) {
assert(!clang_use_chrome_plugins)
}
if (is_linux) {
# Use system fontconfig. This avoids a startup hang on Ubuntu 16.04.4 (see
# issue #2424).
assert(!use_bundled_fontconfig)
}
if (is_mac) {
# Always generate dSYM files. The make_distrib script will fail if
# enable_dsyms=true is not explicitly set when is_official_build=false.