mirror of
https://github.com/zebrajr/node.git
synced 2025-12-06 00:20:08 +01:00
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 Backport-PR-URL: https://github.com/nodejs/node/pull/26478 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>
This commit is contained in:
parent
8080a9bf40
commit
c9d21a0c10
24
common.gypi
24
common.gypi
|
|
@ -84,6 +84,19 @@
|
|||
['OS=="aix"', {
|
||||
'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'
|
||||
],
|
||||
}],
|
||||
],
|
||||
}],
|
||||
['OS == "android"', {
|
||||
'cflags': [ '-fPIE' ],
|
||||
|
|
@ -332,11 +345,18 @@
|
|||
[ 'OS=="aix"', {
|
||||
'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',
|
||||
],
|
||||
}],
|
||||
],
|
||||
'ldflags': [ '-Wl,-bbigtoc' ],
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user