Commit e510ee8
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1812,7 +1812,7 @@ def configure_node_lib_files(o): | |||
| 1812 | 1812 | o['variables']['node_library_files'] = SearchFiles('lib', 'js') | |
| 1813 | 1813 | ||
| 1814 | 1814 | def configure_node_cctest_sources(o): | |
| 1815 | - o['variables']['node_cctest_sources'] = [ 'src/node_snapshot_stub.cc' ] + \ | ||
| 1815 | + o['variables']['node_cctest_sources'] = [] + \ | ||
| 1816 | 1816 | SearchFiles('test/cctest', 'cc') + \ | |
| 1817 | 1817 | SearchFiles('test/cctest', 'h') | |
| 1818 | 1818 | ||
@@ -1880,10 +1880,6 @@ def configure_node(o): | |||
| 1880 | 1880 | o['variables']['arm_fpu'] = options.arm_fpu or 'neon' | |
| 1881 | 1881 | ||
| 1882 | 1882 | if options.node_snapshot_main is not None: | |
| 1883 | - if options.shared: | ||
| 1884 | - # This should be possible to fix, but we will need to refactor the | ||
| 1885 | - # libnode target to avoid building it twice. | ||
| 1886 | - error('--node-snapshot-main is incompatible with --shared') | ||
| 1887 | 1883 | if options.without_node_snapshot: | |
| 1888 | 1884 | error('--node-snapshot-main is incompatible with ' + | |
| 1889 | 1885 | '--without-node-snapshot') | |
@@ -1894,17 +1890,15 @@ def configure_node(o): | |||
| 1894 | 1890 | if options.without_node_snapshot or options.node_builtin_modules_path: | |
| 1895 | 1891 | o['variables']['node_use_node_snapshot'] = 'false' | |
| 1896 | 1892 | else: | |
| 1897 | - o['variables']['node_use_node_snapshot'] = b( | ||
| 1898 | - not cross_compiling and not options.shared) | ||
| 1893 | + o['variables']['node_use_node_snapshot'] = b(not cross_compiling) | ||
| 1899 | 1894 | ||
| 1900 | 1895 | # Do not use code cache when Node.js is built for collecting coverage of itself, this allows more | |
| 1901 | 1896 | # precise coverage for the JS built-ins. | |
| 1902 | 1897 | if options.without_node_code_cache or options.without_node_snapshot or options.node_builtin_modules_path or options.coverage: | |
| 1903 | 1898 | o['variables']['node_use_node_code_cache'] = 'false' | |
| 1904 | 1899 | else: | |
| 1905 | 1900 | # TODO(refack): fix this when implementing embedded code-cache when cross-compiling. | |
| 1906 | - o['variables']['node_use_node_code_cache'] = b( | ||
| 1907 | - not cross_compiling and not options.shared) | ||
| 1901 | + o['variables']['node_use_node_code_cache'] = b(not cross_compiling) | ||
| 1908 | 1902 | ||
| 1909 | 1903 | if options.write_snapshot_as_array_literals is not None: | |
| 1910 | 1904 | o['variables']['node_write_snapshot_as_array_literals'] = b(options.write_snapshot_as_array_literals) | |
0 commit comments