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 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
522 }, | 522 }, |
523 }], | 523 }], |
524 ], | 524 ], |
525 'target_conditions': [ | 525 'target_conditions': [ |
526 ['_type!="static_library"', { | 526 ['_type!="static_library"', { |
527 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, | 527 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, |
528 }], | 528 }], |
529 ], # target_conditions | 529 ], # target_conditions |
530 }, # target_defaults | 530 }, # target_defaults |
531 }], # OS=="mac" | 531 }], # OS=="mac" |
| 532 ['clang==1 and "<(GENERATOR)"=="ninja"', { |
| 533 # See http://crbug.com/110262 |
| 534 'target_defaults': { |
| 535 'cflags': [ '-fcolor-diagnostics' ], |
| 536 'xcode_settings': { 'OTHER_CFLAGS': [ '-fcolor-diagnostics' ] }, |
| 537 }, |
| 538 }], |
532 ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) ' | 539 ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) ' |
533 'and OS!="win" and "<(GENERATOR)"=="make"', { | 540 'and OS!="win" and "<(GENERATOR)"=="make"', { |
534 'make_global_settings': [ | 541 'make_global_settings': [ |
535 ['CC', '../<(clang_dir)/bin/clang'], | 542 ['CC', '../<(clang_dir)/bin/clang'], |
536 ['CXX', '../<(clang_dir)/bin/clang++'], | 543 ['CXX', '../<(clang_dir)/bin/clang++'], |
537 ['CC.host', '$(CC)'], | 544 ['CC.host', '$(CC)'], |
538 ['CXX.host', '$(CXX)'], | 545 ['CXX.host', '$(CXX)'], |
539 ], | 546 ], |
540 }], | 547 }], |
541 ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) ' | 548 ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) ' |
(...skipping 17 matching lines...) Expand all Loading... |
559 ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { | 566 ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { |
560 'make_global_settings': [ | 567 'make_global_settings': [ |
561 ['CC_wrapper', '<(gomadir)/gomacc'], | 568 ['CC_wrapper', '<(gomadir)/gomacc'], |
562 ['CXX_wrapper', '<(gomadir)/gomacc'], | 569 ['CXX_wrapper', '<(gomadir)/gomacc'], |
563 ['CC.host_wrapper', '<(gomadir)/gomacc'], | 570 ['CC.host_wrapper', '<(gomadir)/gomacc'], |
564 ['CXX.host_wrapper', '<(gomadir)/gomacc'], | 571 ['CXX.host_wrapper', '<(gomadir)/gomacc'], |
565 ], | 572 ], |
566 }], | 573 }], |
567 ], | 574 ], |
568 } | 575 } |
OLD | NEW |