From da004fb6c8213956cf6fa608e1d732f8f75da481 Mon Sep 17 00:00:00 2001 From: andy finch Date: Tue, 5 Mar 2019 17:26:59 -0500 Subject: fix snapshots in gn build (#1886) Bug introduced in 75fe80d5a4992ddad89160c2e0113a1af8d3d24a --- build.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'build.rs') diff --git a/build.rs b/build.rs index 98dd393c3..261189f5e 100644 --- a/build.rs +++ b/build.rs @@ -76,11 +76,15 @@ fn main() { } } - // Enable snapshots for x64 builds - if env::var("CARGO_CFG_TARGET_ARCH").unwrap() == "x86_64" { - // Not related to v8_use_snapshot - // This only enables using pregenerated snapshots for isolate init - println!("cargo:rustc-cfg=feature=\"use-snapshot-init\""); + // If target_arch != host_arch disable snapshots since we are cross compiling. + if env::var("CARGO_CFG_TARGET_ARCH").unwrap().as_str() != env::var("HOST") + .unwrap() + .as_str() + .split("-") + .collect::>()[0] + { + // no-snapshot-init is not related to v8_use_snapshots + println!("cargo:rustc-cfg=feature=\"no-snapshot-init\""); } if !gn_out_path.join("build.ninja").exists() { -- cgit v1.2.3