From 4330206174062f2749330c9b9213f1eec972f051 Mon Sep 17 00:00:00 2001
From: Gaby Baghdadi <baghdadi@ca.ibm.com>
Date: Mon, 3 Oct 2022 14:09:22 -0400
Subject: [PATCH] feat: support IBM Open XL C/C++ on z/OS

Open XL C/C++ for z/OS (C invocation: clang, ibm-clang64 or ibm-clang)
is LLVM-based, and doesn't support XL C/C++'s -q flags.
Environment variable CC is set starting with Node.js v18 for z/OS
which requires clang compiler, but CC may not be set in older versions
(which required njsc or xlclang).
---
 addon.gypi | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/addon.gypi b/addon.gypi
index b3489e39bd..b4ac369acb 100644
--- a/addon.gypi
+++ b/addon.gypi
@@ -109,21 +109,35 @@
         ],
       }],
       [ 'OS=="zos"', {
-        'cflags': [
-          '-q64',
-          '-Wc,DLL',
-          '-qlonglong',
-          '-qenum=int',
-          '-qxclang=-fexec-charset=ISO8859-1'
+        'conditions': [
+          [ '"<!(echo $CC)" != "clang" and \
+             "<!(echo $CC)" != "ibm-clang64" and \
+             "<!(echo $CC)" != "ibm-clang"', {
+            'cflags': [
+              '-q64',
+              '-Wc,DLL',
+              '-qlonglong',
+              '-qenum=int',
+              '-qxclang=-fexec-charset=ISO8859-1'
+            ],
+            'ldflags': [
+              '-q64',
+              '<(node_exp_file)',
+            ],
+          }, {
+            'cflags': [
+              '-m64',
+            ],
+            'ldflags': [
+              '-m64',
+              '<(node_exp_file)',
+            ],
+          }],
         ],
         'defines': [
-          '_ALL_SOURCE=1',
+          '_ALL_SOURCE',
           'MAP_FAILED=-1',
-          '_UNIX03_SOURCE=1'
-        ],
-        'ldflags': [
-          '-q64',
-          '<(node_exp_file)'
+          '_UNIX03_SOURCE',
         ],
       }],
       [ 'OS=="win"', {