From e171426652ebac4b321108f31171911de51c3783 Mon Sep 17 00:00:00 2001 From: alexcfyung Date: Wed, 26 Jan 2022 19:48:51 -0500 Subject: [PATCH] build: use zoslib_include_dir provided by node-gyp The path is based on the zoslib gyp path passed to configure.py via --static-zoslib-gyp arg. Co-authored-by: Gaby Baghdadi --- common.gypi | 2 +- configure.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index d22e6fd0ec6fe0..389aa6c3aeacb7 100644 --- a/common.gypi +++ b/common.gypi @@ -619,7 +619,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 index 1bd24a4a8e35db..8929e82c430af8 100755 --- a/configure.py +++ b/configure.py @@ -1160,7 +1160,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= is required.')