| 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 'Optdebug': { | 186 'Optdebug': { |
| 187 'inherit_from': [ 'DebugBaseCommon', 'DebugBase1' ], | 187 'inherit_from': [ 'DebugBaseCommon', 'DebugBase1' ], |
| 188 }, | 188 }, |
| 189 'Debug': { | 189 'Debug': { |
| 190 # Xcode insists on this empty entry. | 190 # Xcode insists on this empty entry. |
| 191 }, | 191 }, |
| 192 'Release': { | 192 'Release': { |
| 193 # Xcode insists on this empty entry. | 193 # Xcode insists on this empty entry. |
| 194 }, | 194 }, |
| 195 }, | 195 }, |
| 196 'conditions':[ |
| 197 ['(clang==1 or host_clang==1) and OS!="win"', { |
| 198 # This is here so that all files get recompiled after a clang roll and |
| 199 # when turning clang on or off. |
| 200 # (defines are passed via the command line, and build systems rebuild |
| 201 # things when their commandline changes). Nothing should ever read this |
| 202 # define. |
| 203 'defines': ['CR_CLANG_REVISION=<!(<(DEPTH)/tools/clang/scripts/update.sh
--print-revision)'], |
| 204 }], |
| 205 ], |
| 196 'target_conditions': [ | 206 'target_conditions': [ |
| 197 ['v8_code == 0', { | 207 ['v8_code == 0', { |
| 198 'defines!': [ | 208 'defines!': [ |
| 199 'DEBUG', | 209 'DEBUG', |
| 200 ], | 210 ], |
| 201 'conditions': [ | 211 'conditions': [ |
| 202 ['os_posix == 1 and OS != "mac"', { | 212 ['os_posix == 1 and OS != "mac"', { |
| 203 # We don't want to get warnings from third-party code, | 213 # We don't want to get warnings from third-party code, |
| 204 # so remove any existing warning-enabling flags like -Wall. | 214 # so remove any existing warning-enabling flags like -Wall. |
| 205 'cflags!': [ | 215 'cflags!': [ |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 ['CC.host', '$(CC)'], | 561 ['CC.host', '$(CC)'], |
| 552 ['CXX.host', '$(CXX)'], | 562 ['CXX.host', '$(CXX)'], |
| 553 ], | 563 ], |
| 554 }], | 564 }], |
| 555 ['clang==1 and OS=="win"', { | 565 ['clang==1 and OS=="win"', { |
| 556 'make_global_settings': [ | 566 'make_global_settings': [ |
| 557 # On Windows, gyp's ninja generator only looks at CC. | 567 # On Windows, gyp's ninja generator only looks at CC. |
| 558 ['CC', '../<(clang_dir)/bin/clang-cl'], | 568 ['CC', '../<(clang_dir)/bin/clang-cl'], |
| 559 ], | 569 ], |
| 560 }], | 570 }], |
| 561 ['(clang==1 or host_clang==1) and OS!="win"', { | |
| 562 # This is here so that all files get recompiled after a clang roll and | |
| 563 # when turning clang on or off. | |
| 564 # (defines are passed via the command line, and build systems rebuild | |
| 565 # things when their commandline changes). Nothing should ever read this | |
| 566 # define. | |
| 567 'defines': ['CR_CLANG_REVISION=<!(<(DEPTH)/tools/clang/scripts/update.sh -
-print-revision)'], | |
| 568 }], | |
| 569 # TODO(yyanagisawa): supports GENERATOR==make | 571 # TODO(yyanagisawa): supports GENERATOR==make |
| 570 # make generator doesn't support CC_wrapper without CC | 572 # make generator doesn't support CC_wrapper without CC |
| 571 # in make_global_settings yet. | 573 # in make_global_settings yet. |
| 572 ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { | 574 ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { |
| 573 'make_global_settings': [ | 575 'make_global_settings': [ |
| 574 ['CC_wrapper', '<(gomadir)/gomacc'], | 576 ['CC_wrapper', '<(gomadir)/gomacc'], |
| 575 ['CXX_wrapper', '<(gomadir)/gomacc'], | 577 ['CXX_wrapper', '<(gomadir)/gomacc'], |
| 576 ['CC.host_wrapper', '<(gomadir)/gomacc'], | 578 ['CC.host_wrapper', '<(gomadir)/gomacc'], |
| 577 ['CXX.host_wrapper', '<(gomadir)/gomacc'], | 579 ['CXX.host_wrapper', '<(gomadir)/gomacc'], |
| 578 ], | 580 ], |
| 579 }], | 581 }], |
| 580 ], | 582 ], |
| 581 } | 583 } |
| OLD | NEW |