Skip to content

Commit

Permalink
Do not run arm/arm64 mksnapshot binaries
Browse files Browse the repository at this point in the history
For arm and arm64 target_arches, Chromium builds mksnapshot as an x64 binary and
as part of that build mksnapshot is executed to produce snapshot_blob.bin.
Chromium does not build native arm and arm64 binaries of mksnapshot, but
Electron does, so this patch makes sure that the build doesn't try to run
the mksnapshot binary if it was built for arm or arm64.

Patch-Filename: do_not_run_arm_arm64_mksnapshot_binaries.patch
  • Loading branch information
John Kleinschmidt authored and Electron Scripts committed Aug 7, 2019
1 parent d9cc135 commit 0efb23f
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1242,9 +1242,19 @@ if (v8_use_snapshot && v8_use_external_startup_data) {
]
public_deps = [
":natives_blob",
":run_mksnapshot_default",
]

if (v8_snapshot_toolchain == "//build/toolchain/linux:clang_arm" ||
v8_snapshot_toolchain == "//build/toolchain/linux:clang_arm64") {
public_deps += [
":mksnapshot($v8_snapshot_toolchain)",
]
} else {
public_deps += [
":run_mksnapshot_default",
]
}

if (v8_use_multi_snapshots) {
public_deps += [ ":run_mksnapshot_trusted" ]
}
Expand Down

0 comments on commit 0efb23f

Please sign in to comment.