Skip to content

Commit

Permalink
build: set -blibpath: for AIX
Browse files Browse the repository at this point in the history
nodejs#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: nodejs#25444

Backport-PR-URL: nodejs#25521
PR-URL: nodejs#25447
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
  • Loading branch information
richardlau committed Mar 6, 2019
1 parent d4b6643 commit 30be5ef
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,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' ],
Expand Down Expand Up @@ -337,11 +350,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' ],
Expand Down

0 comments on commit 30be5ef

Please sign in to comment.