Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 35ce8bb

Browse filesBrowse files
joyeecheungtargos
joyeecheung
authored and
targos
committed
build: do not build mksnapshot and mkcodecache for --shared
To build mkcodecache and mksnapshot (they are executables), we currently build libnode with unresolved symbols, then build the two exectuables with src/node_snapshot_stub.cc and src/node_code_cache_stub.cc. Each of them write a C++ file to disk when being run. We then use the generated C++ files & libnode (with unresolved symbols) to build the final Node executable. However, if libnode itself is the final product, then we should not build it with unresolved symbols. #28897 added the two stubs for the libnode target when the --shared configure option is used, but it did not get rid of the actions to build and run mksnapshot and mkcodecache for --shared, so to get it working we also need a patch to make sure --shared imply --without-node-code-cache and --without-node-snapshot, until we actually fix the TODO so that mksnapshot and mkcodecache do not use the libnode that way. PR-URL: #30647 Refs: #28845 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 78c46c5 commit 35ce8bb
Copy full SHA for 35ce8bb

File tree

Expand file treeCollapse file tree

1 file changed

+3
-2
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+3
-2
lines changed
Open diff view settings
Collapse file

‎configure.py‎

Copy file name to clipboardExpand all lines: configure.py
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -979,13 +979,14 @@ def configure_node(o):
979979

980980
if not options.without_node_snapshot:
981981
o['variables']['node_use_node_snapshot'] = b(
982-
not cross_compiling and want_snapshots)
982+
not cross_compiling and want_snapshots and not options.shared)
983983
else:
984984
o['variables']['node_use_node_snapshot'] = 'false'
985985

986986
if not options.without_node_code_cache:
987987
# TODO(refack): fix this when implementing embedded code-cache when cross-compiling.
988-
o['variables']['node_use_node_code_cache'] = b(not cross_compiling)
988+
o['variables']['node_use_node_code_cache'] = b(
989+
not cross_compiling and not options.shared)
989990
else:
990991
o['variables']['node_use_node_code_cache'] = 'false'
991992

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.