diff options
author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2021-10-19 11:04:22 +0300 |
---|---|---|
committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2021-10-21 05:16:19 +0300 |
commit | f4bd91b0e2d7f07365ccf6bba943ba97d6f95cc9 (patch) | |
tree | 29768f0d203f8154f23158a97b8858d551028c5b /configure.py | |
parent | 73b2d3bc41cf4df9c60f10f80018f3bfc9e2aaa8 (diff) |
deps,build,tools: fix openssl-is-fips for ninja builds
Currently using the --openssl-is-fips configuration option in
combination with --ninja is broken.
This commit fixes two issues, one being an issue with the linker/version
script path variable. The second is that the locations of built
artifacts that differ for ninja and make.
ninja:
$ ./configure --openssl-is-fips --ninja
$ ninja -C out/Release
$ ./node --enable-fips -p 'crypto.getFips()'
1
make:
$ ./configure --openssl-is-fips
$ make -j8
$ ./node --enable-fips -p 'crypto.getFips()'
1
PR-URL: https://github.com/nodejs/node/pull/40518
Refs: https://github.com/nodejs/node/issues/40509
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Beth Griggs <bgriggs@redhat.com>
Diffstat (limited to 'configure.py')
-rwxr-xr-x | configure.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.py b/configure.py index a879a9661d6..77995d09cba 100755 --- a/configure.py +++ b/configure.py @@ -1980,6 +1980,7 @@ write('config.mk', do_not_edit + config_str) gyp_args = ['--no-parallel', '-Dconfiguring_node=1'] +gyp_args += ['-Dbuild_type=' + config['BUILDTYPE']] if options.use_ninja: gyp_args += ['-f', 'ninja'] |