Skip to content

Commit

Permalink
fix: update with changes for OpenSSL 3.x
Browse files Browse the repository at this point in the history
This commit updates __init__.py with changes that were made directly
in Node.js (sorry about this but at the time I was not aware that there
this upstream repo existed).

It includes changes from two commits in Node.js:
 Commit f4bd91b0e2d7f07365ccf6bba943ba97d6f95cc9 ("deps,build,
tools: fix openssl-is-fips for ninja builds) and
Commit 66da32c045035cf2710a48773dc6f55f00e20c40 ("deps,test,src,doc,
tools: update to OpenSSL 3.0")

Refs: nodejs/node#40735
  • Loading branch information
danbev committed May 9, 2022
1 parent c0fee2f commit d4dbe56
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions pylib/gyp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ def Load(
for (key, val) in generator.generator_default_variables.items():
default_variables.setdefault(key, val)

output_dir = params["options"].generator_output or params["options"].toplevel_dir
if (default_variables['GENERATOR'] == 'ninja'):
default_variables.setdefault("PRODUCT_DIR_ABS", os.path.join(output_dir,
'out', default_variables['build_type']))
else:
default_variables.setdefault("PRODUCT_DIR_ABS", os.path.join(output_dir,
default_variables['build_type']))

# Give the generator the opportunity to set additional variables based on
# the params it will receive in the output phase.
if getattr(generator, "CalculateVariables", None):
Expand Down

0 comments on commit d4dbe56

Please sign in to comment.