Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 88b412195fbf741eeab39217c4bee72bf9cbac44..6d6d3841a681b0bcdcc744460245b1b86feb4ea5 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -313,6 +313,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', |
}], |
@@ -1895,6 +1898,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': [ |
@@ -4126,6 +4135,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', |
+ ], |
+ }], |
], |
}], |
], |