| Index: build/toolchain.gypi
|
| diff --git a/build/toolchain.gypi b/build/toolchain.gypi
|
| index badac265159210ae4e117b5a0b5383c2a5b49635..c2a33007334a829ccab0d3bb9992628f40e091dc 100644
|
| --- a/build/toolchain.gypi
|
| +++ b/build/toolchain.gypi
|
| @@ -268,6 +268,11 @@
|
| }], # _toolset=="target"
|
| ],
|
| }], # v8_target_arch=="arm"
|
| + ['v8_target_arch=="a64"', {
|
| + 'defines': [
|
| + 'V8_TARGET_ARCH_A64',
|
| + ],
|
| + }],
|
| ['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=="a64")', {
|
| # Check whether the host compiler and target compiler support the
|
| # '-m64' option and set it if so.
|
| 'target_conditions': [
|
| @@ -513,7 +519,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!': [
|
|
|