Skip to content

Commit aeff49d

Browse files
author
Stewart Addison
committed
build: add shared library support to AIX build
Updates to build the shared library version of node on AIX. Adds the same functionality to AIX that was added on Linux under this: Ref: nodejs#6994 PR-URL: nodejs#9675 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
1 parent fe08594 commit aeff49d

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

configure

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,14 +801,13 @@ def configure_node(o):
801801
o['variables']['node_shared'] = b(options.shared)
802802
o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform)
803803
o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)
804-
o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
805804
o['variables']['node_shared'] = b(options.shared)
806805
node_module_version = getmoduleversion.get_version()
807806

808807
if sys.platform == 'darwin':
809808
shlib_suffix = '%s.dylib'
810809
elif sys.platform.startswith('aix'):
811-
shlib_suffix = '%s.a'
810+
shlib_suffix = '%s.a'
812811
else:
813812
shlib_suffix = 'so.%s'
814813

node.gyp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -810,20 +810,16 @@
810810
['OS=="aix"', {
811811
'targets': [
812812
{
813+
'target_name': 'node',
813814
'conditions': [
814815
['node_shared=="true"', {
815-
'target_name': 'libnode.<(node_module_version)',
816-
'ldflags': ['--shared'],
817816
'type': 'shared_library',
817+
'ldflags': ['--shared'],
818+
'product_extension': '<(shlib_suffix)',
818819
}, {
819-
'target_name': 'node',
820820
'type': 'executable',
821-
'sources': ['src/node_main.cc'],
822821
}],
823822
],
824-
825-
'target_name': 'node',
826-
'type': 'executable',
827823
'dependencies': ['<(node_core_target_name)', 'node_exp'],
828824

829825
'include_dirs': [
@@ -832,6 +828,7 @@
832828
],
833829

834830
'sources': [
831+
'src/node_main.cc',
835832
'<@(library_files)',
836833
# node.gyp is added to the project by default.
837834
'common.gypi',

0 commit comments

Comments
 (0)