Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Build gen_snapshot with a 64-bit host toolchain even if the target platform is 32-bit #12802

Merged
merged 1 commit into from
Oct 4, 2019
Merged

Build gen_snapshot with a 64-bit host toolchain even if the target platform is 32-bit #12802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '01e923507b28e5d1d3fe7597d2db2b30b0a543e9',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '3b6ae6cbb7d891e637331faf689005fd6f302568',

# Fuchsia compatibility
#
Expand Down
8 changes: 7 additions & 1 deletion lib/snapshot/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@ copy("generate_dart_ui") {
}

compiled_action("generate_snapshot_bin") {
tool = "//third_party/dart/runtime/bin:gen_snapshot"
# By default Dart will create a 32-bit gen_snapshot host binary if the target
# platform is 32-bit. Override this to create a 64-bit gen_snapshot for x86
# targets because some host platforms may not support 32-bit binaries.
tool = "//third_party/dart/runtime/bin:gen_snapshot_host_targeting_host"
if (target_cpu == "x86") {
toolchain = "//build/toolchain/$host_os:clang_x64"
}

if ((is_fuchsia || is_fuchsia_host) && !using_fuchsia_sdk) {
platform_kernel =
Expand Down