Skip to content

Commit 945a8e6

Browse files
committed
Revert "build: build codecache and snapshot with libnode"
This reverts commit 3d35dd8.
1 parent 0268df6 commit 945a8e6

2 files changed

Lines changed: 103 additions & 152 deletions

File tree

configure.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1818,7 +1818,7 @@ def configure_node_lib_files(o):
18181818
o['variables']['node_library_files'] = SearchFiles('lib', 'js')
18191819

18201820
def configure_node_cctest_sources(o):
1821-
o['variables']['node_cctest_sources'] = [] + \
1821+
o['variables']['node_cctest_sources'] = [ 'src/node_snapshot_stub.cc' ] + \
18221822
SearchFiles('test/cctest', 'cc') + \
18231823
SearchFiles('test/cctest', 'h')
18241824

@@ -1886,6 +1886,10 @@ def configure_node(o):
18861886
o['variables']['arm_fpu'] = options.arm_fpu or 'neon'
18871887

18881888
if options.node_snapshot_main is not None:
1889+
if options.shared:
1890+
# This should be possible to fix, but we will need to refactor the
1891+
# libnode target to avoid building it twice.
1892+
error('--node-snapshot-main is incompatible with --shared')
18891893
if options.without_node_snapshot:
18901894
error('--node-snapshot-main is incompatible with ' +
18911895
'--without-node-snapshot')
@@ -1896,15 +1900,17 @@ def configure_node(o):
18961900
if options.without_node_snapshot or options.node_builtin_modules_path:
18971901
o['variables']['node_use_node_snapshot'] = 'false'
18981902
else:
1899-
o['variables']['node_use_node_snapshot'] = b(not cross_compiling)
1903+
o['variables']['node_use_node_snapshot'] = b(
1904+
not cross_compiling and not options.shared)
19001905

19011906
# Do not use code cache when Node.js is built for collecting coverage of itself, this allows more
19021907
# precise coverage for the JS built-ins.
19031908
if options.without_node_code_cache or options.without_node_snapshot or options.node_builtin_modules_path or options.coverage:
19041909
o['variables']['node_use_node_code_cache'] = 'false'
19051910
else:
19061911
# TODO(refack): fix this when implementing embedded code-cache when cross-compiling.
1907-
o['variables']['node_use_node_code_cache'] = b(not cross_compiling)
1912+
o['variables']['node_use_node_code_cache'] = b(
1913+
not cross_compiling and not options.shared)
19081914

19091915
if options.write_snapshot_as_array_literals is not None:
19101916
o['variables']['node_write_snapshot_as_array_literals'] = b(options.write_snapshot_as_array_literals)

0 commit comments

Comments
 (0)