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

Unified Diff: tools/gn.py

Issue 2870963002: [infra] Ignore wheezy sysroot for Linux ARM cross-builds (Closed)
Patch Set: Created 3 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn.py
diff --git a/tools/gn.py b/tools/gn.py
index 53f9993b48ff47ddfbee6c399d327ef4fed945f3..71823e0555a2624978a0d9c9373931a42d058116 100755
--- a/tools/gn.py
+++ b/tools/gn.py
@@ -141,6 +141,7 @@ def ToGnArgs(args, mode, arch, target_os):
gn_args['dart_target_arch'] = arch
gn_args['target_cpu'] = TargetCpuForArch(arch, target_os)
gn_args['host_cpu'] = HostCpuForArch(arch)
+ crossbuild = gn_args['target_cpu'] != gn_args['host_cpu']
# See: runtime/observatory/BUILD.gn.
# This allows the standalone build of the observatory to fall back on
@@ -197,7 +198,7 @@ def ToGnArgs(args, mode, arch, target_os):
gn_args['is_tsan'] = args.tsan and gn_args['is_clang']
# Setup the user-defined sysroot.
- if gn_args['target_os'] == 'linux' and args.wheezy:
+ if gn_args['target_os'] == 'linux' and args.wheezy and not crossbuild:
gn_args['dart_use_wheezy_sysroot'] = True
else:
sysroot = TargetSysroot(args)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698