build: use zoslib_include_dir provided by node-gyp

alexcfyung · gabylb · danielleadams · commit d2c16242792f · 2022-04-23T22:26:02.000-04:00
The path is based on the zoslib gyp path passed to configure.py via --static-zoslib-gyp arg. PR-URL: #41713 Co-authored-by: Gaby Baghdadi <baghdadi@ca.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/common.gypi b/common.gypi
@@ -621,7 +621,7 @@
           '-q64',
         ],
         # for addons due to v8config.h include of "zos-base.h":
-        'include_dirs':  ['$(ZOSLIB_INCLUDES)'],
+        'include_dirs':  ['<(zoslib_include_dir)'],
       }],
     ],
   }
diff --git a/configure.py b/configure.py
@@ -1162,7 +1162,8 @@ def configure_zos(o):
   o['variables']['node_static_zoslib'] = b(True)
   if options.static_zoslib_gyp:
     # Apply to all Node.js components for now
-    o['include_dirs'] += [os.path.dirname(options.static_zoslib_gyp) + '/include']
+    o['variables']['zoslib_include_dir'] = os.path.dirname(options.static_zoslib_gyp) + '/include'
+    o['include_dirs'] += [o['variables']['zoslib_include_dir']]
   else:
     raise Exception('--static-zoslib-gyp=<path to zoslib.gyp file> is required.')
 

Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@`
`621`	`621`	`'-q64',`
`622`	`622`	`],`
`623`	`623`	`# for addons due to v8config.h include of "zos-base.h":`
`624`		`- 'include_dirs': ['$(ZOSLIB_INCLUDES)'],`
	`624`	`+ 'include_dirs': ['<(zoslib_include_dir)'],`
`625`	`625`	`}],`
`626`	`626`	`],`
`627`	`627`	`}`