| 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|    90  |    90  | 
|    91       'use_lto%': 0, |    91       'use_lto%': 0, | 
|    92  |    92  | 
|    93       # Control Flow Integrity for virtual calls and casts. |    93       # Control Flow Integrity for virtual calls and casts. | 
|    94       # See http://clang.llvm.org/docs/ControlFlowIntegrity.html |    94       # See http://clang.llvm.org/docs/ControlFlowIntegrity.html | 
|    95       'cfi_vptr%': 0, |    95       'cfi_vptr%': 0, | 
|    96       'cfi_diag%': 0, |    96       'cfi_diag%': 0, | 
|    97  |    97  | 
|    98       'cfi_blacklist%': '<(base_dir)/tools/cfi/blacklist.txt', |    98       'cfi_blacklist%': '<(base_dir)/tools/cfi/blacklist.txt', | 
|    99  |    99  | 
 |   100       # Set to 1 to enable fast builds. | 
 |   101       # TODO(machenbach): Only configured for windows. | 
 |   102       'fastbuild%': 0, | 
 |   103  | 
|   100       # goma settings. |   104       # goma settings. | 
|   101       # 1 to use goma. |   105       # 1 to use goma. | 
|   102       # If no gomadir is set, it uses the default gomadir. |   106       # If no gomadir is set, it uses the default gomadir. | 
|   103       'use_goma%': 0, |   107       'use_goma%': 0, | 
|   104       'gomadir%': '', |   108       'gomadir%': '', | 
|   105       'conditions': [ |   109       'conditions': [ | 
|   106         # Set default gomadir. |   110         # Set default gomadir. | 
|   107         ['OS=="win"', { |   111         ['OS=="win"', { | 
|   108           'gomadir': 'c:\\goma\\goma-win', |   112           'gomadir': 'c:\\goma\\goma-win', | 
|   109         }, { |   113         }, { | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   148     'msan%': '<(msan)', |   152     'msan%': '<(msan)', | 
|   149     'tsan%': '<(tsan)', |   153     'tsan%': '<(tsan)', | 
|   150     'sanitizer_coverage%': '<(sanitizer_coverage)', |   154     'sanitizer_coverage%': '<(sanitizer_coverage)', | 
|   151     'use_custom_libcxx%': '<(use_custom_libcxx)', |   155     'use_custom_libcxx%': '<(use_custom_libcxx)', | 
|   152     'linux_use_bundled_gold%': '<(linux_use_bundled_gold)', |   156     'linux_use_bundled_gold%': '<(linux_use_bundled_gold)', | 
|   153     'use_lto%': '<(use_lto)', |   157     'use_lto%': '<(use_lto)', | 
|   154     'cfi_vptr%': '<(cfi_vptr)', |   158     'cfi_vptr%': '<(cfi_vptr)', | 
|   155     'cfi_diag%': '<(cfi_diag)', |   159     'cfi_diag%': '<(cfi_diag)', | 
|   156     'cfi_blacklist%': '<(cfi_blacklist)', |   160     'cfi_blacklist%': '<(cfi_blacklist)', | 
|   157     'test_isolation_mode%': '<(test_isolation_mode)', |   161     'test_isolation_mode%': '<(test_isolation_mode)', | 
 |   162     'fastbuild%': '<(fastbuild)', | 
|   158  |   163  | 
|   159     # Add a simple extras solely for the purpose of the cctests |   164     # Add a simple extras solely for the purpose of the cctests | 
|   160     'v8_extra_library_files': ['../test/cctest/test-extra.js'], |   165     'v8_extra_library_files': ['../test/cctest/test-extra.js'], | 
|   161     'v8_experimental_extra_library_files': ['../test/cctest/test-experimental-ex
      tra.js'], |   166     'v8_experimental_extra_library_files': ['../test/cctest/test-experimental-ex
      tra.js'], | 
|   162  |   167  | 
|   163     # .gyp files or targets should set v8_code to 1 if they build V8 specific |   168     # .gyp files or targets should set v8_code to 1 if they build V8 specific | 
|   164     # code, as opposed to external code.  This variable is used to control such |   169     # code, as opposed to external code.  This variable is used to control such | 
|   165     # things as the set of warnings to enable, and whether warnings are treated |   170     # things as the set of warnings to enable, and whether warnings are treated | 
|   166     # as errors. |   171     # as errors. | 
|   167     'v8_code%': 0, |   172     'v8_code%': 0, | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   199         'want_separate_host_toolset': 0, |   204         'want_separate_host_toolset': 0, | 
|   200       }], |   205       }], | 
|   201       ['OS == "win"', { |   206       ['OS == "win"', { | 
|   202         'os_posix%': 0, |   207         'os_posix%': 0, | 
|   203       }, { |   208       }, { | 
|   204         'os_posix%': 1, |   209         'os_posix%': 1, | 
|   205       }], |   210       }], | 
|   206       ['OS=="win" and use_goma==1', { |   211       ['OS=="win" and use_goma==1', { | 
|   207         # goma doesn't support pch yet. |   212         # goma doesn't support pch yet. | 
|   208         'chromium_win_pch': 0, |   213         'chromium_win_pch': 0, | 
|   209         # goma doesn't support PDB yet, so win_z7=1 or fastbuild=1. |   214         # goma doesn't support PDB yet. | 
|   210         'conditions': [ |   215         'fastbuild%': 1, | 
|   211           ['win_z7==0 and fastbuild==0', { |  | 
|   212             'fastbuild': 1, |  | 
|   213           }], |  | 
|   214         ], |  | 
|   215       }], |   216       }], | 
|   216       ['((v8_target_arch=="ia32" or v8_target_arch=="x64" or v8_target_arch=="x8
      7") and \ |   217       ['((v8_target_arch=="ia32" or v8_target_arch=="x64" or v8_target_arch=="x8
      7") and \ | 
|   217         (OS=="linux" or OS=="mac")) or (v8_target_arch=="ppc64" and OS=="linux")
      ', { |   218         (OS=="linux" or OS=="mac")) or (v8_target_arch=="ppc64" and OS=="linux")
      ', { | 
|   218         'v8_enable_gdbjit%': 1, |   219         'v8_enable_gdbjit%': 1, | 
|   219       }, { |   220       }, { | 
|   220         'v8_enable_gdbjit%': 0, |   221         'v8_enable_gdbjit%': 0, | 
|   221       }], |   222       }], | 
|   222       ['(OS=="linux" or OS=="mac") and (target_arch=="ia32" or target_arch=="x64
      ") and \ |   223       ['(OS=="linux" or OS=="mac") and (target_arch=="ia32" or target_arch=="x64
      ") and \ | 
|   223         (v8_target_arch!="x87" and v8_target_arch!="x32")', { |   224         (v8_target_arch!="x87" and v8_target_arch!="x32")', { | 
|   224         'clang%': 1, |   225         'clang%': 1, | 
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   426             'target_conditions': [ |   427             'target_conditions': [ | 
|   427               ['_toolset=="target"', { |   428               ['_toolset=="target"', { | 
|   428                 'cflags+': [ |   429                 'cflags+': [ | 
|   429                   '-Wno-format-pedantic', |   430                   '-Wno-format-pedantic', | 
|   430                  ], |   431                  ], | 
|   431               }], |   432               }], | 
|   432            ], |   433            ], | 
|   433           }], |   434           }], | 
|   434         ], |   435         ], | 
|   435       }], |   436       }], | 
 |   437       ['fastbuild!=0', { | 
 |   438         'conditions': [ | 
 |   439           ['OS=="win" and fastbuild==1', { | 
 |   440             'msvs_settings': { | 
 |   441               'VCLinkerTool': { | 
 |   442                 # This tells the linker to generate .pdbs, so that | 
 |   443                 # we can get meaningful stack traces. | 
 |   444                 'GenerateDebugInformation': 'true', | 
 |   445               }, | 
 |   446               'VCCLCompilerTool': { | 
 |   447                 # No debug info to be generated by compiler. | 
 |   448                 'DebugInformationFormat': '0', | 
 |   449               }, | 
 |   450             }, | 
 |   451           }], | 
 |   452         ], | 
 |   453       }],  # fastbuild!=0 | 
|   436     ], |   454     ], | 
|   437     'target_conditions': [ |   455     'target_conditions': [ | 
|   438       ['v8_code == 0', { |   456       ['v8_code == 0', { | 
|   439         'defines!': [ |   457         'defines!': [ | 
|   440           'DEBUG', |   458           'DEBUG', | 
|   441         ], |   459         ], | 
|   442         'conditions': [ |   460         'conditions': [ | 
|   443           ['os_posix == 1 and OS != "mac"', { |   461           ['os_posix == 1 and OS != "mac"', { | 
|   444             # We don't want to get warnings from third-party code, |   462             # We don't want to get warnings from third-party code, | 
|   445             # so remove any existing warning-enabling flags like -Wall. |   463             # so remove any existing warning-enabling flags like -Wall. | 
| (...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1305               '-fsanitize=cfi-vcall', |  1323               '-fsanitize=cfi-vcall', | 
|  1306               '-fsanitize=cfi-derived-cast', |  1324               '-fsanitize=cfi-derived-cast', | 
|  1307               '-fsanitize=cfi-unrelated-cast', |  1325               '-fsanitize=cfi-unrelated-cast', | 
|  1308             ], |  1326             ], | 
|  1309           }], |  1327           }], | 
|  1310         ], |  1328         ], | 
|  1311       }, |  1329       }, | 
|  1312     }], |  1330     }], | 
|  1313   ], |  1331   ], | 
|  1314 } |  1332 } | 
| OLD | NEW |