| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1621,7 +1621,7 @@ def configure_node_lib_files(o): | |||
| 1621 | 1621 | o['variables']['node_library_files'] = SearchFiles('lib', 'js') | |
| 1622 | 1622 | ||
| 1623 | 1623 | def configure_node_cctest_sources(o): | |
| 1624 | - o['variables']['node_cctest_sources'] = [ 'src/node_snapshot_stub.cc' ] + \ | ||
| 1624 | + o['variables']['node_cctest_sources'] = [] + \ | ||
| 1625 | 1625 | SearchFiles('test/cctest', 'cc') + \ | |
| 1626 | 1626 | SearchFiles('test/cctest', 'h') | |
| 1627 | 1627 | ||
@@ -1676,10 +1676,6 @@ def configure_node(o): | |||
| 1676 | 1676 | o['variables']['arm_fpu'] = options.arm_fpu or 'neon' | |
| 1677 | 1677 | ||
| 1678 | 1678 | if options.node_snapshot_main is not None: | |
| 1679 | - if options.shared: | ||
| 1680 | - # This should be possible to fix, but we will need to refactor the | ||
| 1681 | - # libnode target to avoid building it twice. | ||
| 1682 | - error('--node-snapshot-main is incompatible with --shared') | ||
| 1683 | 1679 | if options.without_node_snapshot: | |
| 1684 | 1680 | error('--node-snapshot-main is incompatible with ' + | |
| 1685 | 1681 | '--without-node-snapshot') | |
@@ -1690,17 +1686,15 @@ def configure_node(o): | |||
| 1690 | 1686 | if options.without_node_snapshot or options.node_builtin_modules_path: | |
| 1691 | 1687 | o['variables']['node_use_node_snapshot'] = 'false' | |
| 1692 | 1688 | else: | |
| 1693 | - o['variables']['node_use_node_snapshot'] = b( | ||
| 1694 | - not cross_compiling and not options.shared) | ||
| 1689 | + o['variables']['node_use_node_snapshot'] = b(not cross_compiling) | ||
| 1695 | 1690 | ||
| 1696 | 1691 | # Do not use code cache when Node.js is built for collecting coverage of itself, this allows more | |
| 1697 | 1692 | # precise coverage for the JS built-ins. | |
| 1698 | 1693 | if options.without_node_code_cache or options.without_node_snapshot or options.node_builtin_modules_path or options.coverage: | |
| 1699 | 1694 | o['variables']['node_use_node_code_cache'] = 'false' | |
| 1700 | 1695 | else: | |
| 1701 | 1696 | # TODO(refack): fix this when implementing embedded code-cache when cross-compiling. | |
| 1702 | - o['variables']['node_use_node_code_cache'] = b( | ||
| 1703 | - not cross_compiling and not options.shared) | ||
| 1697 | + o['variables']['node_use_node_code_cache'] = b(not cross_compiling) | ||
| 1704 | 1698 | ||
| 1705 | 1699 | if options.write_snapshot_as_array_literals is not None: | |
| 1706 | 1700 | o['variables']['node_write_snapshot_as_array_literals'] = b(options.write_snapshot_as_array_literals) | |
| Back | FazBrowse Home | New Git URL |
0 commit comments