@@ -87,17 +87,7 @@ def to_command_line(gn_args):
8787
8888def is_host_build(args):
8989 # If target_os == None, then this is a host build.
90- if args.target_os is None:
91- return True
92- # For linux arm64 builds, we cross compile from x64 hosts, so the
93- # target_os='linux' and linux-cpu='arm64'
94- if args.target_os == 'linux' and args.linux_cpu == 'arm64':
95- return True
96- # The Mac and host targets are redundant. Again, necessary to disambiguate
97- # during cross-compilation.
98- if args.target_os == 'mac':
99- return True
100- return False
90+ return args.target_os is None
10191
10292
10393# Determines whether a prebuilt Dart SDK can be used instead of building one.
@@ -433,7 +423,8 @@ def to_gn_args(args):
433423 else:
434424 gn_args['skia_use_gl'] = args.target_os != 'fuchsia'
435425
436- if sys.platform == 'darwin' and args.target_os not in ['android', 'fuchsia']:
426+ if sys.platform == 'darwin' and args.target_os not in ['android', 'fuchsia',
427+ 'linux']:
437428 # OpenGL is deprecated on macOS > 10.11.
438429 # This is not necessarily needed but enabling this until we have a way to
439430 # build a macOS metal only shell and a gl only shell.
@@ -527,8 +518,8 @@ def to_gn_args(args):
527518
528519 # Enable pointer compression on 64-bit mobile targets. iOS is excluded due to
529520 # its inability to allocate address space without allocating memory.
530- if args.target_os in ['android'] and gn_args['target_cpu'] in ['x64' , 'arm64 '
531- ]:
521+ if args.target_os in ['android', 'linux '
522+ ] and gn_args['target_cpu'] in ['x64', 'arm64' ]:
532523 gn_args['dart_use_compressed_pointers'] = True
533524
534525 if args.fuchsia_target_api_level is not None:
@@ -539,6 +530,10 @@ def to_gn_args(args):
539530 'fuchsia/target_api_level')) as file:
540531 gn_args['fuchsia_target_api_level'] = int(file.read().strip())
541532
533+ # Don't use the default Linux sysroot when buliding for Linux on macOS.
534+ if sys.platform == 'darwin' and args.target_os == 'linux':
535+ gn_args['use_default_linux_sysroot'] = False
536+
542537 # Flags for Dart features:
543538 if args.use_mallinfo2:
544539 gn_args['dart_use_mallinfo2'] = args.use_mallinfo2
@@ -571,7 +566,7 @@ def to_gn_args(args):
571566 # There is a special case for Android on Windows because there we _only_ build
572567 # gen_snapshot, but the build defines otherwise make it look like the build is
573568 # for a host Windows build and make GN think we will be building ANGLE.
574- if is_host_build(args) or (args.target_os == 'android ' and
569+ if is_host_build(args) or (args.target_os == 'linux ' and
575570 get_host_os() == 'win'):
576571 # Do not build unnecessary parts of the ANGLE tree.
577572 gn_args['angle_build_all'] = False
0 commit comments