| OLD | NEW |
| 1 # Copyright 2013 the V8 project authors. All rights reserved. | 1 # Copyright 2013 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 | 85 |
| 86 'variables': { | 86 'variables': { |
| 87 # This is set when building the Android WebView inside the Android build | 87 # This is set when building the Android WebView inside the Android build |
| 88 # system, using the 'android' gyp backend. | 88 # system, using the 'android' gyp backend. |
| 89 'android_webview_build%': 0, | 89 'android_webview_build%': 0, |
| 90 }, | 90 }, |
| 91 # Copy it out one scope. | 91 # Copy it out one scope. |
| 92 'android_webview_build%': '<(android_webview_build)', | 92 'android_webview_build%': '<(android_webview_build)', |
| 93 }, | 93 }, |
| 94 'conditions': [ | 94 'conditions': [ |
| 95 ['host_arch=="ia32" or host_arch=="x64" or clang==1', { | 95 ['host_arch=="ia32" or host_arch=="x64" or \ |
| 96 host_arch=="ppc" or host_arch=="ppc64" or \ |
| 97 clang==1', { |
| 96 'variables': { | 98 'variables': { |
| 97 'host_cxx_is_biarch%': 1, | 99 'host_cxx_is_biarch%': 1, |
| 98 }, | 100 }, |
| 99 }, { | 101 }, { |
| 100 'variables': { | 102 'variables': { |
| 101 'host_cxx_is_biarch%': 0, | 103 'host_cxx_is_biarch%': 0, |
| 102 }, | 104 }, |
| 103 }], | 105 }], |
| 104 ['target_arch=="ia32" or target_arch=="x64" or target_arch=="x87" or \ | 106 ['target_arch=="ia32" or target_arch=="x64" or target_arch=="x87" or \ |
| 107 target_arch=="ppc" or target_arch=="ppc64" or \ |
| 105 clang==1', { | 108 clang==1', { |
| 106 'variables': { | 109 'variables': { |
| 107 'target_cxx_is_biarch%': 1, | 110 'target_cxx_is_biarch%': 1, |
| 108 }, | 111 }, |
| 109 }, { | 112 }, { |
| 110 'variables': { | 113 'variables': { |
| 111 'target_cxx_is_biarch%': 0, | 114 'target_cxx_is_biarch%': 0, |
| 112 }, | 115 }, |
| 113 }], | 116 }], |
| 114 ], | 117 ], |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 }], | 238 }], |
| 236 ], | 239 ], |
| 237 }], # _toolset=="target" | 240 }], # _toolset=="target" |
| 238 ], | 241 ], |
| 239 }], # v8_target_arch=="arm" | 242 }], # v8_target_arch=="arm" |
| 240 ['v8_target_arch=="arm64"', { | 243 ['v8_target_arch=="arm64"', { |
| 241 'defines': [ | 244 'defines': [ |
| 242 'V8_TARGET_ARCH_ARM64', | 245 'V8_TARGET_ARCH_ARM64', |
| 243 ], | 246 ], |
| 244 }], | 247 }], |
| 248 ['v8_target_arch=="ppc" or v8_target_arch=="ppc64"', { |
| 249 'defines': [ |
| 250 'V8_TARGET_ARCH_PPC', |
| 251 ], |
| 252 'conditions': [ |
| 253 ['v8_target_arch=="ppc64"', { |
| 254 'defines': [ |
| 255 'V8_TARGET_ARCH_PPC64', |
| 256 ], |
| 257 }], |
| 258 ['v8_host_byteorder=="little"', { |
| 259 'defines': [ |
| 260 'V8_TARGET_ARCH_PPC_LE', |
| 261 ], |
| 262 }], |
| 263 ['v8_host_byteorder=="big"', { |
| 264 'defines': [ |
| 265 'V8_TARGET_ARCH_PPC_BE', |
| 266 ], |
| 267 }], |
| 268 ], |
| 269 }], # ppc |
| 245 ['v8_target_arch=="ia32"', { | 270 ['v8_target_arch=="ia32"', { |
| 246 'defines': [ | 271 'defines': [ |
| 247 'V8_TARGET_ARCH_IA32', | 272 'V8_TARGET_ARCH_IA32', |
| 248 ], | 273 ], |
| 249 }], # v8_target_arch=="ia32" | 274 }], # v8_target_arch=="ia32" |
| 250 ['v8_target_arch=="x87"', { | 275 ['v8_target_arch=="x87"', { |
| 251 'defines': [ | 276 'defines': [ |
| 252 'V8_TARGET_ARCH_X87', | 277 'V8_TARGET_ARCH_X87', |
| 253 ], | 278 ], |
| 254 'cflags': ['-march=i586'], | 279 'cflags': ['-march=i586'], |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 'msvs_settings': { | 482 'msvs_settings': { |
| 458 'VCLinkerTool': { | 483 'VCLinkerTool': { |
| 459 'GenerateMapFile': 'true', | 484 'GenerateMapFile': 'true', |
| 460 }, | 485 }, |
| 461 }, | 486 }, |
| 462 }], | 487 }], |
| 463 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ | 488 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
| 464 or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ | 489 or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ |
| 465 (v8_target_arch=="arm" or v8_target_arch=="ia32" or \ | 490 (v8_target_arch=="arm" or v8_target_arch=="ia32" or \ |
| 466 v8_target_arch=="x87" or v8_target_arch=="mips" or \ | 491 v8_target_arch=="x87" or v8_target_arch=="mips" or \ |
| 467 v8_target_arch=="mipsel")', { | 492 v8_target_arch=="mipsel" or v8_target_arch=="ppc")', { |
| 468 'target_conditions': [ | 493 'target_conditions': [ |
| 469 ['_toolset=="host"', { | 494 ['_toolset=="host"', { |
| 470 'conditions': [ | 495 'conditions': [ |
| 471 ['host_cxx_is_biarch==1', { | 496 ['host_cxx_is_biarch==1', { |
| 472 'cflags': [ '-m32' ], | 497 'cflags': [ '-m32' ], |
| 473 'ldflags': [ '-m32' ] | 498 'ldflags': [ '-m32' ] |
| 474 }], | 499 }], |
| 475 ], | 500 ], |
| 476 'xcode_settings': { | 501 'xcode_settings': { |
| 477 'ARCHS': [ 'i386' ], | 502 'ARCHS': [ 'i386' ], |
| 478 }, | 503 }, |
| 479 }], | 504 }], |
| 480 ['_toolset=="target"', { | 505 ['_toolset=="target"', { |
| 481 'conditions': [ | 506 'conditions': [ |
| 482 ['target_cxx_is_biarch==1 and nacl_target_arch!="nacl_x64"', { | 507 ['target_cxx_is_biarch==1 and nacl_target_arch!="nacl_x64"', { |
| 483 'cflags': [ '-m32' ], | 508 'cflags': [ '-m32' ], |
| 484 'ldflags': [ '-m32' ], | 509 'ldflags': [ '-m32' ], |
| 485 }], | 510 }], |
| 486 ], | 511 ], |
| 487 'xcode_settings': { | 512 'xcode_settings': { |
| 488 'ARCHS': [ 'i386' ], | 513 'ARCHS': [ 'i386' ], |
| 489 }, | 514 }, |
| 490 }], | 515 }], |
| 491 ], | 516 ], |
| 492 }], | 517 }], |
| 493 ['(OS=="linux" or OS=="android") and \ | 518 ['(OS=="linux" or OS=="android") and \ |
| 494 (v8_target_arch=="x64" or v8_target_arch=="arm64")', { | 519 (v8_target_arch=="x64" or v8_target_arch=="arm64" or \ |
| 520 v8_target_arch=="ppc64")', { |
| 495 'target_conditions': [ | 521 'target_conditions': [ |
| 496 ['_toolset=="host"', { | 522 ['_toolset=="host"', { |
| 497 'conditions': [ | 523 'conditions': [ |
| 498 ['host_cxx_is_biarch==1', { | 524 ['host_cxx_is_biarch==1', { |
| 499 'cflags': [ '-m64' ], | 525 'cflags': [ '-m64' ], |
| 500 'ldflags': [ '-m64' ] | 526 'ldflags': [ '-m64' ] |
| 501 }], | 527 }], |
| 502 ], | 528 ], |
| 503 }], | 529 }], |
| 504 ['_toolset=="target"', { | 530 ['_toolset=="target"', { |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 'OptimizeReferences': '2', | 851 'OptimizeReferences': '2', |
| 826 'EnableCOMDATFolding': '2', | 852 'EnableCOMDATFolding': '2', |
| 827 }, | 853 }, |
| 828 }, | 854 }, |
| 829 }], # OS=="win" | 855 }], # OS=="win" |
| 830 ], # conditions | 856 ], # conditions |
| 831 }, # Release | 857 }, # Release |
| 832 }, # configurations | 858 }, # configurations |
| 833 }, # target_defaults | 859 }, # target_defaults |
| 834 } | 860 } |
| OLD | NEW |