Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index dbfd8243fe7f52f8174d6529da5ac955e2ed5d16..280ec278f77703931b979327db8fa17ac08fd627 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -151,6 +151,10 @@ |
'use_goma%': 0, |
'gomadir%': '', |
+ # The system root for cross-compiles. Default: none. |
+ 'sysroot%': '', |
+ 'chroot_cmd%': '', |
+ |
'conditions': [ |
# Ash needs Aura. |
['use_aura==0', { |
@@ -258,6 +262,8 @@ |
'buildtype%': '<(buildtype)', |
'branding%': '<(branding)', |
'arm_version%': '<(arm_version)', |
+ 'sysroot%': '<(sysroot)', |
+ 'chroot_cmd%': '<(chroot_cmd)', |
# Set to 1 to enable fast builds. Set to 2 for even faster builds |
# (it disables debug info for fastest compilation - only for use |
@@ -283,10 +289,6 @@ |
# Detect NEON support at run-time. |
'arm_neon_optional%': 0, |
- # The system root for cross-compiles. Default: none. |
- 'sysroot%': '', |
- 'chroot_cmd%': '', |
- |
# The system libdir used for this ABI. |
'system_libdir%': 'lib', |
@@ -2979,8 +2981,7 @@ |
}, |
}, |
'conditions': [ |
- # TODO(jochen): Enable this on chromeos. http://crbug.com/353127 |
- ['os_posix==1 and chromeos==0', { |
+ ['os_posix==1', { |
'target_defaults': { |
'ldflags': [ |
'-Wl,--fatal-warnings', |