Skip to content

Commit e936907

Browse files
richardlauBethGriggs
authored andcommitted
build: set -blibpath: for AIX
#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: #25444 Backport-PR-URL: #25521 PR-URL: #25447 Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
1 parent f6ff8c5 commit e936907

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

common.gypi

+22-2
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,19 @@
8888
['OS=="aix"', {
8989
'cflags': [ '-gxcoff' ],
9090
'ldflags': [ '-Wl,-bbigtoc' ],
91+
'conditions': [
92+
['target_arch=="ppc64"', {
93+
'ldflags': [
94+
'-Wl,-blibpath:/usr/lib:/lib:'
95+
'/opt/freeware/lib/pthread/ppc64'
96+
],
97+
}],
98+
['target_arch=="ppc"', {
99+
'ldflags': [
100+
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread'
101+
],
102+
}],
103+
],
91104
}],
92105
['OS == "android"', {
93106
'cflags': [ '-fPIE' ],
@@ -337,11 +350,18 @@
337350
[ 'OS=="aix"', {
338351
'conditions': [
339352
[ 'target_arch=="ppc"', {
340-
'ldflags': [ '-Wl,-bmaxdata:0x60000000/dsa' ],
353+
'ldflags': [
354+
'-Wl,-bmaxdata:0x60000000/dsa',
355+
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread',
356+
],
341357
}],
342358
[ 'target_arch=="ppc64"', {
343359
'cflags': [ '-maix64' ],
344-
'ldflags': [ '-maix64' ],
360+
'ldflags': [
361+
'-maix64',
362+
'-Wl,-blibpath:/usr/lib:/lib:'
363+
'/opt/freeware/lib/pthread/ppc64',
364+
],
345365
}],
346366
],
347367
'ldflags': [ '-Wl,-bbigtoc' ],

0 commit comments

Comments
 (0)