diff options
Diffstat (limited to 'deps/v8/build/toolchain.gypi')
| -rw-r--r-- | deps/v8/build/toolchain.gypi | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/deps/v8/build/toolchain.gypi b/deps/v8/build/toolchain.gypi index badac26515..4a70d6f7a7 100644 --- a/deps/v8/build/toolchain.gypi +++ b/deps/v8/build/toolchain.gypi @@ -268,6 +268,11 @@ }], # _toolset=="target" ], }], # v8_target_arch=="arm" + ['v8_target_arch=="arm64"', { + 'defines': [ + 'V8_TARGET_ARCH_ARM64', + ], + }], ['v8_target_arch=="ia32"', { 'defines': [ 'V8_TARGET_ARCH_IA32', @@ -407,7 +412,8 @@ }], ], }], - ['(OS=="linux") and (v8_target_arch=="x64")', { + ['(OS=="linux" or OS=="android") and \ + (v8_target_arch=="x64" or v8_target_arch=="arm64")', { # Check whether the host compiler and target compiler support the # '-m64' option and set it if so. 'target_conditions': [ @@ -422,8 +428,12 @@ 'variables': { 'm64flag': '<!(($(echo ${CXX_target:-<(CXX)}) -m64 -E - > /dev/null 2>&1 < /dev/null) && echo "-m64" || true)', }, - 'cflags': [ '<(m64flag)' ], - 'ldflags': [ '<(m64flag)' ], + 'conditions': [ + ['((OS!="android" and OS!="qnx") or clang==1)', { + 'cflags': [ '<(m64flag)' ], + 'ldflags': [ '<(m64flag)' ], + }], + ], }] ], }], @@ -513,7 +523,8 @@ OS=="qnx"', { 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', '-Wnon-virtual-dtor', '-Woverloaded-virtual', - '<(wno_array_bounds)' ], + '<(wno_array_bounds)', + ], 'conditions': [ ['v8_optimized_debug==0', { 'cflags!': [ |