Skip to content

Commit a4f50a6

Browse files
richardlauaddaleax
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 PR-URL: #25447 Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
1 parent 9a61a7a commit a4f50a6

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

common.gypi

+20-2
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,17 @@
120120
'cflags': [ '-gxcoff' ],
121121
'ldflags': [ '-Wl,-bbigtoc' ],
122122
'conditions': [
123+
['target_arch=="ppc64"', {
124+
'ldflags': [
125+
'-Wl,-blibpath:/usr/lib:/lib:'
126+
'/opt/freeware/lib/pthread/ppc64'
127+
],
128+
}],
129+
['target_arch=="ppc"', {
130+
'ldflags': [
131+
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread'
132+
],
133+
}],
123134
['"<(real_os_name)"=="OS400"', {
124135
'ldflags': [
125136
'-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
@@ -424,11 +435,18 @@
424435
'variables': {'real_os_name': '<!(uname -s)',},
425436
'conditions': [
426437
[ 'target_arch=="ppc"', {
427-
'ldflags': [ '-Wl,-bmaxdata:0x60000000/dsa' ],
438+
'ldflags': [
439+
'-Wl,-bmaxdata:0x60000000/dsa',
440+
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread',
441+
],
428442
}],
429443
[ 'target_arch=="ppc64"', {
430444
'cflags': [ '-maix64' ],
431-
'ldflags': [ '-maix64' ],
445+
'ldflags': [
446+
'-maix64',
447+
'-Wl,-blibpath:/usr/lib:/lib:'
448+
'/opt/freeware/lib/pthread/ppc64',
449+
],
432450
}],
433451
['"<(real_os_name)"=="OS400"', {
434452
'ldflags': [

0 commit comments

Comments
 (0)