diff options
| author | Refael Ackermann <refack@gmail.com> | 2019-01-15 13:41:22 -0500 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2019-01-23 17:56:01 -0500 |
| commit | b1a4e4100635da33d9dbee7908758c8523a520b2 (patch) | |
| tree | bfe2466e236ba7ebc8b3bc5799d13e5d988f5895 /common.gypi | |
| parent | a6286e64c517b14b28cf84325ea24eab52b4c45f (diff) | |
| download | android-node-v8-b1a4e4100635da33d9dbee7908758c8523a520b2.tar.gz android-node-v8-b1a4e4100635da33d9dbee7908758c8523a520b2.tar.bz2 android-node-v8-b1a4e4100635da33d9dbee7908758c8523a520b2.zip | |
build: remove AIX/ppc (32bit) dead code
* also dedup OS400 detection
PR-URL: https://github.com/nodejs/node/pull/25523
Refs: https://github.com/nodejs/node/pull/25447/files/36839defcfaf7c46435e16fb1f0da006f3ebe8ac#r247378894
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 77 |
1 files changed, 27 insertions, 50 deletions
diff --git a/common.gypi b/common.gypi index e683760a4a..63a81f2c4f 100644 --- a/common.gypi +++ b/common.gypi @@ -145,28 +145,8 @@ 'msvs_configuration_platform': 'x64', }], ['OS=="aix"', { - 'variables': {'real_os_name': '<!(uname -s)',}, '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' - ], - }], - ['"<(real_os_name)"=="OS400"', { - 'ldflags': [ - '-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib', - '-Wl,-brtl', - ], - }], - ], }], ['OS == "android"', { 'cflags': [ '-fPIE' ], @@ -451,9 +431,9 @@ 'ldflags': [ '-m32' ], }], [ 'target_arch=="ppc64" and OS!="aix"', { - 'cflags': [ '-m64', '-mminimal-toc' ], - 'ldflags': [ '-m64' ], - }], + 'cflags': [ '-m64', '-mminimal-toc' ], + 'ldflags': [ '-m64' ], + }], [ 'target_arch=="s390"', { 'cflags': [ '-m31', '-march=z196' ], 'ldflags': [ '-m31', '-march=z196' ], @@ -468,38 +448,35 @@ 'cflags!': [ '-pthread' ], 'ldflags!': [ '-pthread' ], }], - [ 'OS=="aix"', { - 'variables': {'real_os_name': '<!(uname -s)',}, - 'conditions': [ - [ 'target_arch=="ppc"', { - 'ldflags': [ - '-Wl,-bmaxdata:0x60000000/dsa', - '-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread', - ], - }], - [ 'target_arch=="ppc64"', { - 'cflags': [ '-maix64' ], - 'ldflags': [ - '-maix64', - '-Wl,-blibpath:/usr/lib:/lib:' - '/opt/freeware/lib/pthread/ppc64', - ], - }], - ['"<(real_os_name)"=="OS400"', { - 'ldflags': [ - '-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib', - '-Wl,-brtl', - ], - }], - ], - 'ldflags': [ '-Wl,-bbigtoc' ], - 'ldflags!': [ '-rdynamic' ], - }], [ 'node_shared=="true"', { 'cflags': [ '-fPIC' ], }], ], }], + [ 'OS=="aix"', { + 'variables': { + # Used to differentiate `AIX` and `OS400`(IBM i). + 'aix_variant_name': '<!(uname -s)', + }, + 'cflags': [ '-maix64', ], + 'ldflags!': [ '-rdynamic', ], + 'ldflags': [ + '-Wl,-bbigtoc', + '-maix64', + ], + 'conditions': [ + [ '"<(aix_variant_name)"=="OS400"', { # a.k.a. `IBM i` + 'ldflags': [ + '-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib', + '-Wl,-brtl', + ], + }, { # else it's `AIX` + 'ldflags': [ + '-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread/ppc64', + ], + }], + ], + }], ['OS=="android"', { 'target_conditions': [ ['_toolset=="target"', { |