| 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 316 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 327             'cflags': [ '-mminimal-toc' ], | 327             'cflags': [ '-mminimal-toc' ], | 
| 328           }], | 328           }], | 
| 329           [ 'visibility=="hidden" and v8_enable_backtrace==0', { | 329           [ 'visibility=="hidden" and v8_enable_backtrace==0', { | 
| 330             'cflags': [ '-fvisibility=hidden' ], | 330             'cflags': [ '-fvisibility=hidden' ], | 
| 331           }], | 331           }], | 
| 332           [ 'component=="shared_library"', { | 332           [ 'component=="shared_library"', { | 
| 333             'cflags': [ '-fPIC', ], | 333             'cflags': [ '-fPIC', ], | 
| 334           }], | 334           }], | 
| 335         ], | 335         ], | 
| 336       }, | 336       }, | 
| 337       'conditions': [ |  | 
| 338         ['clang!=1 and host_clang==1 and target_arch!="ia32" and target_arch!="x
     64"', { |  | 
| 339           'make_global_settings': [ |  | 
| 340             ['CC.host', '../<(clang_dir)/bin/clang'], |  | 
| 341             ['CXX.host', '../<(clang_dir)/bin/clang++'], |  | 
| 342           ], |  | 
| 343         }], |  | 
| 344         ['clang==0 and host_clang==1', { |  | 
| 345           'target_conditions': [ |  | 
| 346             ['_toolset=="host"', { |  | 
| 347               'cflags_cc': [ '-std=gnu++11', ], |  | 
| 348             }], |  | 
| 349           ], |  | 
| 350           'target_defaults': { |  | 
| 351             'target_conditions': [ |  | 
| 352               ['_toolset=="host"', { 'cflags!': [ '-Wno-unused-local-typedefs' ]
     }], |  | 
| 353             ], |  | 
| 354           }, |  | 
| 355         }], |  | 
| 356       ], |  | 
| 357     }], | 337     }], | 
| 358     # 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" | 338     # 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" | 
| 359     #  or OS=="netbsd"' | 339     #  or OS=="netbsd"' | 
| 360     ['OS=="qnx"', { | 340     ['OS=="qnx"', { | 
| 361       'target_defaults': { | 341       'target_defaults': { | 
| 362         'cflags': [ | 342         'cflags': [ | 
| 363           '-Wall', | 343           '-Wall', | 
| 364           '<(werror)', | 344           '<(werror)', | 
| 365           '-Wno-unused-parameter', | 345           '-Wno-unused-parameter', | 
| 366           '-fno-exceptions', | 346           '-fno-exceptions', | 
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 522             }, | 502             }, | 
| 523           }], | 503           }], | 
| 524         ], | 504         ], | 
| 525         'target_conditions': [ | 505         'target_conditions': [ | 
| 526           ['_type!="static_library"', { | 506           ['_type!="static_library"', { | 
| 527             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, | 507             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, | 
| 528           }], | 508           }], | 
| 529         ],  # target_conditions | 509         ],  # target_conditions | 
| 530       },  # target_defaults | 510       },  # target_defaults | 
| 531     }],  # OS=="mac" | 511     }],  # OS=="mac" | 
|  | 512     ['clang!=1 and host_clang==1 and target_arch!="ia32" and target_arch!="x64"'
     , { | 
|  | 513       'make_global_settings': [ | 
|  | 514         ['CC.host', '../<(clang_dir)/bin/clang'], | 
|  | 515         ['CXX.host', '../<(clang_dir)/bin/clang++'], | 
|  | 516       ], | 
|  | 517     }], | 
|  | 518     ['clang==0 and host_clang==1 and target_arch!="ia32" and target_arch!="x64"'
     , { | 
|  | 519       'target_conditions': [ | 
|  | 520         ['_toolset=="host"', { | 
|  | 521           'cflags_cc': [ '-std=gnu++11', ], | 
|  | 522         }], | 
|  | 523       ], | 
|  | 524       'target_defaults': { | 
|  | 525         'target_conditions': [ | 
|  | 526           ['_toolset=="host"', { 'cflags!': [ '-Wno-unused-local-typedefs' ]}], | 
|  | 527         ], | 
|  | 528       }, | 
|  | 529     }], | 
| 532     ['clang==1 and "<(GENERATOR)"=="ninja"', { | 530     ['clang==1 and "<(GENERATOR)"=="ninja"', { | 
| 533       # See http://crbug.com/110262 | 531       # See http://crbug.com/110262 | 
| 534       'target_defaults': { | 532       'target_defaults': { | 
| 535         'cflags': [ '-fcolor-diagnostics' ], | 533         'cflags': [ '-fcolor-diagnostics' ], | 
| 536         'xcode_settings': { 'OTHER_CFLAGS': [ '-fcolor-diagnostics' ] }, | 534         'xcode_settings': { 'OTHER_CFLAGS': [ '-fcolor-diagnostics' ] }, | 
| 537       }, | 535       }, | 
| 538     }], | 536     }], | 
| 539     ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) ' | 537     ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) ' | 
| 540         'and OS!="win" and "<(GENERATOR)"=="make"', { | 538         'and OS!="win" and "<(GENERATOR)"=="make"', { | 
| 541       'make_global_settings': [ | 539       'make_global_settings': [ | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
| 566     ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { | 564     ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { | 
| 567       'make_global_settings': [ | 565       'make_global_settings': [ | 
| 568        ['CC_wrapper', '<(gomadir)/gomacc'], | 566        ['CC_wrapper', '<(gomadir)/gomacc'], | 
| 569        ['CXX_wrapper', '<(gomadir)/gomacc'], | 567        ['CXX_wrapper', '<(gomadir)/gomacc'], | 
| 570        ['CC.host_wrapper', '<(gomadir)/gomacc'], | 568        ['CC.host_wrapper', '<(gomadir)/gomacc'], | 
| 571        ['CXX.host_wrapper', '<(gomadir)/gomacc'], | 569        ['CXX.host_wrapper', '<(gomadir)/gomacc'], | 
| 572       ], | 570       ], | 
| 573     }], | 571     }], | 
| 574   ], | 572   ], | 
| 575 } | 573 } | 
| OLD | NEW | 
|---|