Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 6fb0d42d8c3fb92168d2ff468908ee875b96e405..535585051ec652c218719241200557a8bc9042b2 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', |
+ }], |
['target_arch=="x64"', { |
'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_amd64-sysroot', |
}], |
@@ -1885,6 +1888,14 @@ |
}], |
['OS=="linux"', { |
'clang%': 1, |
+ 'conditions': [ |
+ ['target_arch=="arm64"', { |
+ # Temporarily disable nacl and tcmalloc on arm64 linux to get |
+ # rid of compilation errors. |
+ 'disable_nacl%': 1, |
+ 'use_allocator%': 'none', |
+ }], |
+ ], |
}], # OS=="mac" |
['OS=="mac"', { |
'conditions': [ |
@@ -4108,6 +4119,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', |
+ ], |
+ }], |
], |
}], |
], |