From 1d90b5b78e40ad5165e2eaec14e8f230bd08658d Mon Sep 17 00:00:00 2001 From: Andrei Sedoi Date: Fri, 16 May 2014 02:11:51 +0300 Subject: [PATCH] configure: allow V8 snapshot for cross-compilation Signed-off-by: Fedor Indutny --- common.gypi | 16 ++++++++-------- configure | 3 +++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/common.gypi b/common.gypi index 8adafe3..c05b793 100644 --- a/common.gypi +++ b/common.gypi @@ -1,13 +1,13 @@ { 'variables': { - 'werror': '', # Turn off -Werror in V8 build. - 'visibility%': 'hidden', # V8's visibility setting - 'target_arch%': 'ia32', # set v8's target architecture - 'host_arch%': 'ia32', # set v8's host architecture - 'want_separate_host_toolset': 0, # V8 should not build target and host - 'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds - 'component%': 'static_library', # NB. these names match with what V8 expects - 'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way + 'werror': '', # Turn off -Werror in V8 build. + 'visibility%': 'hidden', # V8's visibility setting + 'target_arch%': 'ia32', # set v8's target architecture + 'host_arch%': 'ia32', # set v8's host architecture + 'want_separate_host_toolset%': 0, # V8 should not build target and host + 'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds + 'component%': 'static_library', # NB. these names match with what V8 expects + 'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way 'gcc_version%': 'unknown', 'clang%': 0, 'python%': 'python', diff --git a/configure b/configure index a55d8c9..90caa7c 100755 --- a/configure +++ b/configure @@ -471,6 +471,9 @@ def configure_node(o): o['variables']['host_arch'] = host_arch o['variables']['target_arch'] = target_arch + if target_arch != host_arch and not options.without_snapshot: + o['variables']['want_separate_host_toolset'] = 1 + if target_arch == 'arm': configure_arm(o) elif target_arch in ('mips', 'mipsel'): -- 2.7.4