| 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 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 }, | 351 }, |
| 352 'Optdebug': { | 352 'Optdebug': { |
| 353 'inherit_from': [ 'DebugBaseCommon', 'DebugBase1' ], | 353 'inherit_from': [ 'DebugBaseCommon', 'DebugBase1' ], |
| 354 }, | 354 }, |
| 355 'Debug': { | 355 'Debug': { |
| 356 # Xcode insists on this empty entry. | 356 # Xcode insists on this empty entry. |
| 357 }, | 357 }, |
| 358 'Release': { | 358 'Release': { |
| 359 'cflags+': ['<@(release_extra_cflags)'], | 359 'cflags+': ['<@(release_extra_cflags)'], |
| 360 }, | 360 }, |
| 361 'conditions': [ |
| 362 ['OS=="win"', { |
| 363 'Optdebug_x64': { |
| 364 'inherit_from': ['Optdebug'], |
| 365 }, |
| 366 'Debug_x64': { |
| 367 'inherit_from': ['Debug'], |
| 368 }, |
| 369 'Release_x64': { |
| 370 'inherit_from': ['Release'], |
| 371 }, |
| 372 }], |
| 373 ], |
| 361 }, | 374 }, |
| 362 'conditions':[ | 375 'conditions':[ |
| 363 ['(clang==1 or host_clang==1) and OS!="win"', { | 376 ['(clang==1 or host_clang==1) and OS!="win"', { |
| 364 # This is here so that all files get recompiled after a clang roll and | 377 # This is here so that all files get recompiled after a clang roll and |
| 365 # when turning clang on or off. | 378 # when turning clang on or off. |
| 366 # (defines are passed via the command line, and build systems rebuild | 379 # (defines are passed via the command line, and build systems rebuild |
| 367 # things when their commandline changes). Nothing should ever read this | 380 # things when their commandline changes). Nothing should ever read this |
| 368 # define. | 381 # define. |
| 369 'defines': ['CR_CLANG_REVISION=<!(<(DEPTH)/tools/clang/scripts/update.sh
--print-revision)'], | 382 'defines': ['CR_CLANG_REVISION=<!(<(DEPTH)/tools/clang/scripts/update.sh
--print-revision)'], |
| 370 'cflags+': [ | 383 'cflags+': [ |
| (...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1042 ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { | 1055 ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { |
| 1043 'make_global_settings': [ | 1056 'make_global_settings': [ |
| 1044 ['CC_wrapper', '<(gomadir)/gomacc'], | 1057 ['CC_wrapper', '<(gomadir)/gomacc'], |
| 1045 ['CXX_wrapper', '<(gomadir)/gomacc'], | 1058 ['CXX_wrapper', '<(gomadir)/gomacc'], |
| 1046 ['CC.host_wrapper', '<(gomadir)/gomacc'], | 1059 ['CC.host_wrapper', '<(gomadir)/gomacc'], |
| 1047 ['CXX.host_wrapper', '<(gomadir)/gomacc'], | 1060 ['CXX.host_wrapper', '<(gomadir)/gomacc'], |
| 1048 ], | 1061 ], |
| 1049 }], | 1062 }], |
| 1050 ], | 1063 ], |
| 1051 } | 1064 } |
| OLD | NEW |