Skip to content

Commit b6ff57b

Browse files
yhwangMylesBorins
yhwang
authored and
MylesBorins
committed
build: refine static and shared lib build
Refine the static and shared lib build process in order to integrate static and shared lib verfication into CI. When building both static and shared lib, we still build node executable now and it uses the shared and static lib. Signed-off-by: Yihong Wang <[email protected]> Refs: #14158 PR-URL: #17604 Reviewed-By: Bartosz Sosnowski <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]>
1 parent fe3d60e commit b6ff57b

5 files changed

Lines changed: 358 additions & 300 deletions

File tree

‎configure‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,6 @@ def configure_node(o):
881881
configure_mips(o)
882882

883883
if flavor == 'aix':
884-
o['variables']['node_core_target_name'] = 'node_base'
885884
o['variables']['node_target_type'] = 'static_library'
886885

887886
if target_arch in ('x86', 'x64', 'ia32', 'x32'):
@@ -991,6 +990,13 @@ def configure_node(o):
991990
else:
992991
o['variables']['coverage'] = 'false'
993992

993+
if options.shared:
994+
o['variables']['node_target_type'] = 'shared_library'
995+
elif options.enable_static:
996+
o['variables']['node_target_type'] = 'static_library'
997+
else:
998+
o['variables']['node_target_type'] = 'executable'
999+
9941000
def configure_library(lib, output):
9951001
shared_lib = 'shared_' + lib
9961002
output['variables']['node_' + shared_lib] = b(getattr(options, shared_lib))
@@ -1487,8 +1493,7 @@ config = {
14871493
'BUILDTYPE': 'Debug' if options.debug else 'Release',
14881494
'USE_XCODE': str(int(options.use_xcode or 0)),
14891495
'PYTHON': sys.executable,
1490-
'NODE_TARGET_TYPE': variables['node_target_type'] if options.enable_static \
1491-
else '',
1496+
'NODE_TARGET_TYPE': variables['node_target_type'],
14921497
}
14931498

14941499
if options.prefix:

0 commit comments

Comments
 (0)