@@ -93,17 +93,7 @@ def to_command_line(gn_args):
9393
9494def is_host_build(args):
9595 # If target_os == None, then this is a host build.
96- if args.target_os is None:
97- return True
98- # For linux arm64 builds, we cross compile from x64 hosts, so the
99- # target_os='linux' and linux-cpu='arm64'
100- if args.target_os == 'linux' and args.linux_cpu == 'arm64':
101- return True
102- # The Mac and host targets are redundant. Again, necessary to disambiguate
103- # during cross-compilation.
104- if args.target_os == 'mac':
105- return True
106- return False
96+ return args.target_os is None
10797
10898
10999# Determines whether a prebuilt Dart SDK can be used instead of building one.
@@ -667,7 +657,8 @@ def to_gn_args(args):
667657 else:
668658 gn_args['skia_use_gl'] = args.target_os != 'fuchsia'
669659
670- if sys.platform == 'darwin' and args.target_os not in ['android', 'fuchsia']:
660+ if sys.platform == 'darwin' and args.target_os not in ['android', 'fuchsia',
661+ 'linux']:
671662 # OpenGL is deprecated on macOS > 10.11.
672663 # This is not necessarily needed but enabling this until we have a way to
673664 # build a macOS metal only shell and a gl only shell.
@@ -766,13 +757,17 @@ def to_gn_args(args):
766757
767758 # Enable pointer compression on 64-bit mobile targets. iOS is excluded due to
768759 # its inability to allocate address space without allocating memory.
769- if args.target_os in ['android'] and gn_args['target_cpu'] in ['x64', 'arm64']:
760+ if args.target_os in ['android', 'linux' ] and gn_args['target_cpu'] in ['x64', 'arm64']:
770761 gn_args['dart_use_compressed_pointers'] = True
771762
772763 if args.target_os == 'fuchsia':
773764 gn_args['gn_configs_path'] = '//flutter/build/config/fuchsia/gn_configs.gni'
774765 gn_args['fuchsia_gn_sdk'] = '//flutter/tools/fuchsia/gn-sdk'
775766
767+ # Don't use the default Linux sysroot when buliding for Linux on macOS.
768+ if sys.platform == 'darwin' and args.target_os == 'linux':
769+ gn_args['use_default_linux_sysroot'] = False
770+
776771 # Flags for Dart features:
777772 if args.use_mallinfo2:
778773 gn_args['dart_use_mallinfo2'] = args.use_mallinfo2
@@ -809,9 +804,9 @@ def to_gn_args(args):
809804 # gen_snapshot, but the build defines otherwise make it look like the build is
810805 # for a host Windows build and make GN think we will be building ANGLE.
811806 # Angle is not used on Mac hosts as there are no tests for the OpenGL backend.
812- if is_host_build(args) or (args.target_os == 'android' and get_host_os() == 'win'):
813- # Don't include git commit information.
814- gn_args['angle_enable_commit_id'] = False
807+ if ( is_host_build(args) and
808+ gn_args['host_os'] != 'mac') or (args.target_os == 'linux' and
809+ get_host_os() == 'win'):
815810 # Do not build unnecessary parts of the ANGLE tree.
816811 gn_args['angle_build_all'] = False
817812 gn_args['angle_has_astc_encoder'] = False
0 commit comments