From aeff49dfcd494d488f77219628f299c2570af574 Mon Sep 17 00:00:00 2001
From: Stewart Addison <sxa@uk.ibm.com>
Date: Mon, 14 Nov 2016 13:43:41 +0000
Subject: [PATCH] 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: https://github.com/nodejs/node/pull/6994/

PR-URL: https://github.com/nodejs/node/pull/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>
---
 configure |  3 +--
 node.gyp  | 11 ++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index c2f038ba92a929..dd2645de6d51a0 100755
--- a/configure
+++ b/configure
@@ -801,14 +801,13 @@ def configure_node(o):
   o['variables']['node_shared'] = b(options.shared)
   o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform)
   o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)
-  o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
   o['variables']['node_shared'] = b(options.shared)
   node_module_version = getmoduleversion.get_version()
 
   if sys.platform == 'darwin':
     shlib_suffix = '%s.dylib'
   elif sys.platform.startswith('aix'):
-    shlib_suffix = '%s.a' 
+    shlib_suffix = '%s.a'
   else:
     shlib_suffix = 'so.%s'
 
diff --git a/node.gyp b/node.gyp
index 9fa51756a14340..5b43361a6454e2 100644
--- a/node.gyp
+++ b/node.gyp
@@ -810,20 +810,16 @@
     ['OS=="aix"', {
       'targets': [
         {
+          'target_name': 'node',
           'conditions': [
             ['node_shared=="true"', {
-              'target_name': 'libnode.<(node_module_version)',
-              'ldflags': ['--shared'],
               'type': 'shared_library',
+              'ldflags': ['--shared'],
+              'product_extension': '<(shlib_suffix)',
             }, {
-              'target_name': 'node',
               'type': 'executable',
-              'sources': ['src/node_main.cc'],
             }],
           ],
-
-          'target_name': 'node',
-          'type': 'executable',
           'dependencies': ['<(node_core_target_name)', 'node_exp'],
 
           'include_dirs': [
@@ -832,6 +828,7 @@
           ],
 
           'sources': [
+            'src/node_main.cc',
             '<@(library_files)',
             # node.gyp is added to the project by default.
             'common.gypi',