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 9c2f686

Browse filesBrowse files
gibfahnevanlucas
authored andcommitted
build: don't build deps/zlib if --shared-zlib set
Even if the --shared-zlib flag was used, the bundled deps/zlib was still being compiled into the binary as it was required by the C++ test suite. PR-URL: #10657 Fixes: #10649 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
1 parent e3a316f commit 9c2f686
Copy full SHA for 9c2f686

File tree

Expand file treeCollapse file tree

1 file changed

+5
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+5
-1
lines changed
Open diff view settings
Collapse file

‎node.gyp‎

Copy file name to clipboardExpand all lines: node.gyp
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,6 @@
900900
'HAVE_INSPECTOR=1',
901901
],
902902
'dependencies': [
903-
'deps/zlib/zlib.gyp:zlib',
904903
'v8_inspector_compress_protocol_json#host'
905904
],
906905
'include_dirs': [
@@ -913,6 +912,11 @@
913912
'test/cctest/test_inspector_socket_server.cc'
914913
],
915914
'conditions': [
915+
[ 'node_shared_zlib=="false"', {
916+
'dependencies': [
917+
'deps/zlib/zlib.gyp:zlib',
918+
]
919+
}],
916920
[ 'node_shared_openssl=="false"', {
917921
'dependencies': [
918922
'deps/openssl/openssl.gyp:openssl'

0 commit comments

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