Skip to content

Commit b340c2d

Browse files
yhwangrefack
authored andcommitted
build: remove cctest extension
cctest has `so.59` extension when building node shared library in linux. The appending is defined in node.gypi and the cctest target in node.gyp includes node.gypi. Moving the appending from node.gypi to node target in node.gyp fixes the issue. Signed-off-by: Yihong Wang <yh.wang@ibm.com> PR-URL: #16680 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com>
1 parent 3cacd34 commit b340c2d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

node.gyp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,11 @@
315315
'NODE_OPENSSL_SYSTEM_CERT_PATH="<(openssl_system_ca_path)"',
316316
],
317317
},
318+
'conditions': [
319+
[ 'node_shared=="true" and node_module_version!="" and OS!="win"', {
320+
'product_extension': '<(shlib_suffix)',
321+
}]
322+
],
318323
},
319324
{
320325
'target_name': 'mkssldef',

node.gypi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
'defines': [
1212
'NODE_SHARED_MODE',
1313
],
14-
'conditions': [
15-
[ 'node_module_version!="" and OS!="win"', {
16-
'product_extension': '<(shlib_suffix)',
17-
}]
18-
],
1914
}],
2015
[ 'node_enable_d8=="true"', {
2116
'dependencies': [ 'deps/v8/src/d8.gyp:d8' ],

0 commit comments

Comments
 (0)