Skip to content

Commit d2c1624

Browse files
alexcfyunggabylb
authored andcommitted
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. PR-URL: #41713 Co-authored-by: Gaby Baghdadi <baghdadi@ca.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent d77db88 commit d2c1624

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@
621621
'-q64',
622622
],
623623
# for addons due to v8config.h include of "zos-base.h":
624-
'include_dirs': ['$(ZOSLIB_INCLUDES)'],
624+
'include_dirs': ['<(zoslib_include_dir)'],
625625
}],
626626
],
627627
}

configure.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,8 @@ def configure_zos(o):
11621162
o['variables']['node_static_zoslib'] = b(True)
11631163
if options.static_zoslib_gyp:
11641164
# Apply to all Node.js components for now
1165-
o['include_dirs'] += [os.path.dirname(options.static_zoslib_gyp) + '/include']
1165+
o['variables']['zoslib_include_dir'] = os.path.dirname(options.static_zoslib_gyp) + '/include'
1166+
o['include_dirs'] += [o['variables']['zoslib_include_dir']]
11661167
else:
11671168
raise Exception('--static-zoslib-gyp=<path to zoslib.gyp file> is required.')
11681169

0 commit comments

Comments
 (0)