Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4532)

Unified Diff: build/common.gypi

Issue 2001523002: GYP changes for arm64 linux build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/libwebp/README.chromium » ('j') | third_party/libwebp/libwebp.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
+ ],
+ }],
],
}],
],
« no previous file with comments | « no previous file | third_party/libwebp/README.chromium » ('j') | third_party/libwebp/libwebp.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698