Skip to content

Commit e0fa7e0

Browse files
alexcfyunggabylb
andauthored
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 <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent ee38bbd commit e0fa7e0

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
@@ -615,7 +615,7 @@
615615
'-q64',
616616
],
617617
# for addons due to v8config.h include of "zos-base.h":
618-
'include_dirs': ['$(ZOSLIB_INCLUDES)'],
618+
'include_dirs': ['<(zoslib_include_dir)'],
619619
}],
620620
],
621621
}

configure.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,8 @@ def configure_zos(o):
11591159
o['variables']['node_static_zoslib'] = b(True)
11601160
if options.static_zoslib_gyp:
11611161
# Apply to all Node.js components for now
1162-
o['include_dirs'] += [os.path.dirname(options.static_zoslib_gyp) + '/include']
1162+
o['variables']['zoslib_include_dir'] = os.path.dirname(options.static_zoslib_gyp) + '/include'
1163+
o['include_dirs'] += [o['variables']['zoslib_include_dir']]
11631164
else:
11641165
raise Exception('--static-zoslib-gyp=<path to zoslib.gyp file> is required.')
11651166

0 commit comments

Comments
 (0)