DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restore setting dart_target_arch to fix Windows build. (flutter/engine#3883)

Browse Source 
The Windows build does not have an appropriate target_cpu because it is incomplete and does not build the engine.
This commit is contained in:
Ryan Macnak 2017-07-17 13:33:33 -07:00 committed by GitHub
parent 3003fe147a
commit 6bcc758317
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engine/src/flutter/tools/gn
View File

@ -98,19 +98,21 @@ def to_gn_args(args):
# Building host artifacts
gn_args['target_cpu'] = 'x64'
# No cross-compilation on Windows (for now).
if sys.platform.startswith(('cygwin', 'win')):
if 'target_os' in gn_args:
gn_args['target_os'] = 'win'
if 'target_cpu' in gn_args:
gn_args['target_cpu'] = cpu_for_target_arch(gn_args['target_cpu'])
# On iOS Devices, use the Dart bytecode interpreter so we don't incur
# snapshotting and linking costs of the precompiler during development.
# We can still use the JIT on the simulator though.
use_dbc = args.target_os == 'ios' and not args.simulator and args.runtime_mode == 'debug'
if use_dbc:
gn_args['dart_target_arch'] = 'dbc'
else:
gn_args['dart_target_arch'] = gn_args['target_cpu']
# No cross-compilation on Windows (for now).
if sys.platform.startswith(('cygwin', 'win')):
if 'target_os' in gn_args:
gn_args['target_os'] = 'win'
if 'target_cpu' in gn_args:
gn_args['target_cpu'] = cpu_for_target_arch(gn_args['target_cpu'])
# Modify host_toolchain into dart_host_toolchain so it matches word size of target_cpu
target_is_32_bit = gn_args['target_cpu'] == 'arm' or gn_args['target_cpu'] == 'x86'