Skip to content

Commit

Permalink
build: remove cctest extension
Browse files Browse the repository at this point in the history
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>

Backport-PR-URL: #17255
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>
  • Loading branch information
yhwang authored and MylesBorins committed Nov 28, 2017
1 parent 50c3dab commit a0c1d10
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 5 additions & 0 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,11 @@
# Warn when using deprecated V8 APIs.
'V8_DEPRECATION_WARNINGS=1',
],
'conditions': [
[ 'node_shared=="true" and node_module_version!="" and OS!="win"', {
'product_extension': '<(shlib_suffix)',
}]
],
},
{
'target_name': 'mkssldef',
Expand Down
5 changes: 0 additions & 5 deletions node.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@
'defines': [
'NODE_SHARED_MODE',
],
'conditions': [
[ 'node_module_version!="" and OS!="win"', {
'product_extension': '<(shlib_suffix)',
}]
],
}],
[ 'node_enable_d8=="true"', {
'dependencies': [ 'deps/v8/src/d8.gyp:d8' ],
Expand Down

0 comments on commit a0c1d10

Please sign in to comment.