Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 6fb0d42d8c3fb92168d2ff468908ee875b96e405..ce41430750ebddc5768f8c8ccae32929cb49268a 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -303,6 +303,9 @@ |
| ['target_arch=="arm"', { |
| 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_arm-sysroot', |
| }], |
| + ['target_arch=="arm64"', { |
| + 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_arm64-sysroot', |
|
Nico
2016/06/02 17:57:24
why jessie?
(also, build/linux/sysroot_scripts/in
apatole
2016/06/03 06:11:47
Hi, I explained it on https://codereview.chromium.
|
| + }], |
| ['target_arch=="x64"', { |
| 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_amd64-sysroot', |
| }], |
| @@ -1885,6 +1888,12 @@ |
| }], |
| ['OS=="linux"', { |
| 'clang%': 1, |
| + 'conditions': [ |
| + ['target_arch=="arm64"', { |
| + 'disable_nacl%': 1, # Disable Native Client |
| + 'use_allocator%': 'none', # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors. |
| + }], |
| + ], |
| }], # OS=="mac" |
| ['OS=="mac"', { |
| 'conditions': [ |
| @@ -4108,6 +4117,14 @@ |
| '-fstack-protector', # stack protector is always enabled on arm64. |
| ], |
| }], |
| + ['clang==1 and arm_arch!="" and OS!="android"', { |
| + 'cflags': [ |
| + '-target aarch64-linux-gnu', |
| + ], |
| + 'ldflags': [ |
| + '-target aarch64-linux-gnu', |
| + ], |
| + }], |
| ], |
| }], |
| ], |