diff options
author | Richard Lau <riclau@uk.ibm.com> | 2019-01-11 16:36:33 +0000 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2019-01-14 16:50:55 +0100 |
commit | a4f50a62d57f484a6441ab1c4c26f049f70ea0c5 (patch) | |
tree | d955b58a312f4ce1dc417b574dc03e7f80277fba /common.gypi | |
parent | 9a61a7abb36d0935cee9be0d6b54318fc2c0cf0a (diff) | |
download | node-new-a4f50a62d57f484a6441ab1c4c26f049f70ea0c5.tar.gz |
build: set `-blibpath:` for AIX
https://github.com/nodejs/node/pull/17604 refactored the gyp files
so that `-blibpath:` on AIX was only set if `node_shared=="true"`.
Restore the setting for non-shared builds.
Fixes: https://github.com/nodejs/node/issues/25444
PR-URL: https://github.com/nodejs/node/pull/25447
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'common.gypi')
-rw-r--r-- | common.gypi | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/common.gypi b/common.gypi index 2a40282d21..724d070c4c 100644 --- a/common.gypi +++ b/common.gypi @@ -120,6 +120,17 @@ 'cflags': [ '-gxcoff' ], 'ldflags': [ '-Wl,-bbigtoc' ], 'conditions': [ + ['target_arch=="ppc64"', { + 'ldflags': [ + '-Wl,-blibpath:/usr/lib:/lib:' + '/opt/freeware/lib/pthread/ppc64' + ], + }], + ['target_arch=="ppc"', { + 'ldflags': [ + '-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread' + ], + }], ['"<(real_os_name)"=="OS400"', { 'ldflags': [ '-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib', @@ -424,11 +435,18 @@ 'variables': {'real_os_name': '<!(uname -s)',}, 'conditions': [ [ 'target_arch=="ppc"', { - 'ldflags': [ '-Wl,-bmaxdata:0x60000000/dsa' ], + 'ldflags': [ + '-Wl,-bmaxdata:0x60000000/dsa', + '-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread', + ], }], [ 'target_arch=="ppc64"', { 'cflags': [ '-maix64' ], - 'ldflags': [ '-maix64' ], + 'ldflags': [ + '-maix64', + '-Wl,-blibpath:/usr/lib:/lib:' + '/opt/freeware/lib/pthread/ppc64', + ], }], ['"<(real_os_name)"=="OS400"', { 'ldflags': [ |