Skip to content

Commit 0a90dda

Browse files
committed
Fix Windows and macOS builds
1 parent fa3038e commit 0a90dda

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

tools/gn

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ def is_host_build(args):
9696
# If target_os == None, then this is a host build.
9797
# However, for linux arm64 builds, we cross compile from x64 hosts, so the
9898
# target_os='linux' and linux-cpu='arm64'
99-
return args.target_os is None or (
100-
args.target_os == 'linux' and args.linux_cpu == 'arm64'
101-
)
99+
return args.target_os is None
102100

103101

104102
# Determines whether a prebuilt Dart SDK can be used instead of building one.
@@ -541,7 +539,7 @@ def to_gn_args(args):
541539
# There is a special case for Android on Windows because there we _only_ build
542540
# gen_snapshot, but the build defines otherwise make it look like the build is
543541
# for a host Windows build and make GN think we will be building ANGLE.
544-
if is_host_build(args) or (args.target_os == 'android' and
542+
if is_host_build(args) or (args.target_os == 'linux' and
545543
get_host_os() == 'win'):
546544
# Do not build unnecessary parts of the ANGLE tree.
547545
gn_args['angle_build_all'] = False

0 commit comments

Comments
 (0)