Enable back Jumbo build on arm64

This commit is contained in:
Aleksei Kuzmin 2017-12-15 01:32:28 +03:00
Родитель 65a15e2ea0
Коммит d7e812f50f
3 изменённых файлов: 1 добавлений и 14 удалений

Просмотреть файл

@ -15,11 +15,8 @@ if (target_os != "linux") {
# Jumbo build should improve compilation times. # Jumbo build should improve compilation times.
# https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md # https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md
use_jumbo_build = true use_jumbo_build = true
if (target_cpu == "arm64") {
# Temporary disable on arm64 due to "error: '__' macro redefined".
# Should be enabled back eventually.
use_jumbo_build = false
if (target_cpu == "arm64") {
# Suppress the linking warning for arm64: # Suppress the linking warning for arm64:
# warning: libfreetype.so.6, needed by ../../build/linux/debian_jessie_arm64-sysroot/usr/lib/aarch64-linux-gnu/libfontconfig.so, may conflict with libfreetype.so.6 # warning: libfreetype.so.6, needed by ../../build/linux/debian_jessie_arm64-sysroot/usr/lib/aarch64-linux-gnu/libfontconfig.so, may conflict with libfreetype.so.6
fatal_linker_warnings = false fatal_linker_warnings = false

Просмотреть файл

@ -18,11 +18,6 @@ if (target_os != "linux") {
# Jumbo build should improve compilation times. # Jumbo build should improve compilation times.
# https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md # https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md
use_jumbo_build = true use_jumbo_build = true
if (target_cpu == "arm64") {
# Temporary disable on arm64 due to "error: '__' macro redefined".
# Should be enabled back eventually.
use_jumbo_build = false
}
# This is required by Node.js # This is required by Node.js
# See https://github.com/nodejs/node/pull/13242 # See https://github.com/nodejs/node/pull/13242

Просмотреть файл

@ -22,11 +22,6 @@ if (target_os != "linux") {
# Jumbo build should improve compilation times. # Jumbo build should improve compilation times.
# https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md # https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md
use_jumbo_build = true use_jumbo_build = true
if (target_cpu == "arm64") {
# Temporary disable on arm64 due to "error: '__' macro redefined".
# Should be enabled back eventually.
use_jumbo_build = false
}
# This is required by Node.js # This is required by Node.js
# See https://github.com/nodejs/node/pull/13242 # See https://github.com/nodejs/node/pull/13242