From 8d3e7e1854926bcaabceed4d7c00700157d30a74 Mon Sep 17 00:00:00 2001 From: Yihong Wang Date: Wed, 1 Nov 2017 21:19:16 -0700 Subject: [PATCH] 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 PR-URL: https://github.com/nodejs/node/pull/16680 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell Reviewed-By: Michael Dawson Reviewed-By: Colin Ihrig Reviewed-By: Gibson Fahnestock Reviewed-By: Gireesh Punathil Reviewed-By: Daniel Bevenius Reviewed-By: Refael Ackermann --- node.gyp | 5 +++++ node.gypi | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/node.gyp b/node.gyp index fa1b204ee6fb0b..345188257998e0 100644 --- a/node.gyp +++ b/node.gyp @@ -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', diff --git a/node.gypi b/node.gypi index 6aaabeed42aac1..3b3548fdab5308 100644 --- a/node.gypi +++ b/node.gypi @@ -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' ],