Skip to content

Commit

Permalink
build: fix IBM i build with Python 3.9
Browse files Browse the repository at this point in the history
Python 3.9 on IBM i returns "os400" for `sys.platform`.

PR-URL: #48056
Refs: #46739
Refs: nodejs/build#3358
Reviewed-By: Moshe Atlow <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
  • Loading branch information
richardlau authored and targos committed Nov 11, 2023
1 parent 829eb99 commit 878c0b3
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion deps/openssl/openssl-cl_asm.gypi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'conditions': [
['target_arch=="ppc64" and OS=="aix"', {
['target_arch=="ppc64" and OS in ("aix", "os400")', {
'includes': ['config/archs/aix64-gcc-as/asm/openssl-cl.gypi'],
}, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', {
'includes': ['config/archs/linux-ppc64le/asm/openssl-cl.gypi'],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/openssl-cl_asm_avx2.gypi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'conditions': [
['target_arch=="ppc64" and OS=="aix"', {
['target_arch=="ppc64" and OS in ("aix", "os400")', {
'includes': ['config/archs/aix64-gcc-as/asm_avx2/openssl-cl.gypi'],
}, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', {
'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl-cl.gypi'],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/openssl-cl_no_asm.gypi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'conditions': [
['target_arch=="ppc64" and OS=="aix"', {
['target_arch=="ppc64" and OS in ("aix", "os400")', {
'includes': ['config/archs/aix64-gcc-as/no-asm/openssl-cl.gypi'],
}, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', {
'includes': ['config/archs/linux-ppc64le/no-asm/openssl-cl.gypi'],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/openssl-fips_asm.gypi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'conditions': [
['target_arch=="ppc64" and OS=="aix"', {
['target_arch=="ppc64" and OS in ("aix", "os400")', {
'includes': ['config/archs/aix64-gcc-as/asm/openssl-fips.gypi'],
}, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', {
'includes': ['config/archs/linux-ppc64le/asm/openssl-fips.gypi'],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/openssl-fips_asm_avx2.gypi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'conditions': [
['target_arch=="ppc64" and OS=="aix"', {
['target_arch=="ppc64" and OS in ("aix", "os400")', {
'includes': ['config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi'],
}, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', {
'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi'],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/openssl-fips_no_asm.gypi
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
'defines': ['OPENSSL_NO_ASM'],
'conditions': [
['target_arch=="ppc64" and OS=="aix"', {
['target_arch=="ppc64" and OS in ("aix", "os400")', {
'includes': ['config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi'],
}, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', {
'includes': ['config/archs/linux-ppc64le/no-asm/openssl-fips.gypi'],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/openssl_asm.gypi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'conditions': [
['target_arch=="ppc64" and OS=="aix"', {
['target_arch=="ppc64" and OS in ("aix", "os400")', {
'includes': ['config/archs/aix64-gcc-as/asm/openssl.gypi'],
}, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', {
'includes': ['config/archs/linux-ppc64le/asm/openssl.gypi'],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/openssl_asm_avx2.gypi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'conditions': [
['target_arch=="ppc64" and OS=="aix"', {
['target_arch=="ppc64" and OS in ("aix", "os400")', {
'includes': ['config/archs/aix64-gcc-as/asm_avx2/openssl.gypi'],
}, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', {
'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl.gypi'],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/openssl_common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
],
# build options specific to OS
'conditions': [
[ 'OS=="aix"', {
[ 'OS in ("aix", "os400")', {
# AIX is missing /usr/include/endian.h
'defines': [
'__LITTLE_ENDIAN=1234',
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/openssl_no_asm.gypi
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
'defines': ['OPENSSL_NO_ASM'],
'conditions': [
['target_arch=="ppc64" and OS=="aix"', {
['target_arch=="ppc64" and OS in ("aix", "os400")', {
'includes': ['config/archs/aix64-gcc-as/no-asm/openssl.gypi'],
}, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', {
'includes': ['config/archs/linux-ppc64le/no-asm/openssl.gypi'],
Expand Down

0 comments on commit 878c0b3

Please sign in to comment.