Skip to content

Commit c9d21a0

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: #26478 PR-URL: #25447 Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
1 parent 8080a9b commit c9d21a0

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
@@ -84,6 +84,19 @@
8484
['OS=="aix"', {
8585
'cflags': [ '-gxcoff' ],
8686
'ldflags': [ '-Wl,-bbigtoc' ],
87+
'conditions': [
88+
['target_arch=="ppc64"', {
89+
'ldflags': [
90+
'-Wl,-blibpath:/usr/lib:/lib:'
91+
'/opt/freeware/lib/pthread/ppc64'
92+
],
93+
}],
94+
['target_arch=="ppc"', {
95+
'ldflags': [
96+
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread'
97+
],
98+
}],
99+
],
87100
}],
88101
['OS == "android"', {
89102
'cflags': [ '-fPIE' ],
@@ -332,11 +345,18 @@
332345
[ 'OS=="aix"', {
333346
'conditions': [
334347
[ 'target_arch=="ppc"', {
335-
'ldflags': [ '-Wl,-bmaxdata:0x60000000/dsa' ],
348+
'ldflags': [
349+
'-Wl,-bmaxdata:0x60000000/dsa',
350+
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread',
351+
],
336352
}],
337353
[ 'target_arch=="ppc64"', {
338354
'cflags': [ '-maix64' ],
339-
'ldflags': [ '-maix64' ],
355+
'ldflags': [
356+
'-maix64',
357+
'-Wl,-blibpath:/usr/lib:/lib:'
358+
'/opt/freeware/lib/pthread/ppc64',
359+
],
340360
}],
341361
],
342362
'ldflags': [ '-Wl,-bbigtoc' ],

0 commit comments

Comments
 (0)