| OLD | NEW |
| 1 # Copyright 2012 the V8 project authors. All rights reserved. | 1 # Copyright 2012 the V8 project authors. All rights reserved. |
| 2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
| 3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
| 4 # met: | 4 # met: |
| 5 # | 5 # |
| 6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
| 9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
| 10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
| (...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 'cflags': [ '<(m32flag)' ], | 457 'cflags': [ '<(m32flag)' ], |
| 458 'ldflags': [ '<(m32flag)' ], | 458 'ldflags': [ '<(m32flag)' ], |
| 459 }], | 459 }], |
| 460 ], | 460 ], |
| 461 'xcode_settings': { | 461 'xcode_settings': { |
| 462 'ARCHS': [ 'i386' ], | 462 'ARCHS': [ 'i386' ], |
| 463 }, | 463 }, |
| 464 }], | 464 }], |
| 465 ], | 465 ], |
| 466 }], | 466 }], |
| 467 ['(OS=="linux") and (v8_target_arch=="x64")', { | 467 ['(OS=="linux" or OS=="android") and \ |
| 468 (v8_target_arch=="x64" or v8_target_arch=="a64")', { |
| 468 # Check whether the host compiler and target compiler support the | 469 # Check whether the host compiler and target compiler support the |
| 469 # '-m64' option and set it if so. | 470 # '-m64' option and set it if so. |
| 470 'target_conditions': [ | 471 'target_conditions': [ |
| 471 ['_toolset=="host"', { | 472 ['_toolset=="host"', { |
| 472 'variables': { | 473 'variables': { |
| 473 'm64flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m64 -E -
> /dev/null 2>&1) && echo "-m64" || true)', | 474 'm64flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m64 -E -
> /dev/null 2>&1) && echo "-m64" || true)', |
| 474 }, | 475 }, |
| 475 'cflags': [ '<(m64flag)' ], | 476 'cflags': [ '<(m64flag)' ], |
| 476 'ldflags': [ '<(m64flag)' ], | 477 'ldflags': [ '<(m64flag)' ], |
| 477 }], | 478 }], |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 642 'OptimizeReferences': '2', | 643 'OptimizeReferences': '2', |
| 643 'EnableCOMDATFolding': '2', | 644 'EnableCOMDATFolding': '2', |
| 644 }, | 645 }, |
| 645 }, | 646 }, |
| 646 }], # OS=="win" | 647 }], # OS=="win" |
| 647 ], # conditions | 648 ], # conditions |
| 648 }, # Release | 649 }, # Release |
| 649 }, # configurations | 650 }, # configurations |
| 650 }, # target_defaults | 651 }, # target_defaults |
| 651 } | 652 } |
| OLD | NEW |