diff options
author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-06-21 10:20:56 +0200 |
---|---|---|
committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-06-24 07:51:06 +0200 |
commit | 748b2a87ca4effb39186d89f7e16a145a4bf9365 (patch) | |
tree | ebe43b9ff216638c1f28f914194efa564d024283 /configure | |
parent | befede64f14858ffea4e8d6f93700be07e0f85fc (diff) | |
download | node-new-748b2a87ca4effb39186d89f7e16a145a4bf9365.tar.gz |
build: clean up config_fips.gypi
Currently when configuring the project using --openssl-fips a gyp
include file name config_fips.gypi will be created. If the project is
later configured but without the --openssl-fips flag an error will
occur. For example:
$ ./configure --openssl-fips=bogus
$ ./configure && make -j8
...
/node/deps/openssl/fips/fipsld:
line 8: /bin/fipsld: No such file or directory
Error 127
This commit suggests removing the generate config_fips.gypi when the
--openssl-fips flag is not give on the command line.
PR-URL: https://github.com/nodejs/node/pull/13837
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -984,7 +984,10 @@ def configure_openssl(o): ] else: o['variables']['openssl_fips'] = '' - + try: + os.remove('config_fips.gypi') + except OSError: + pass if options.without_ssl: def without_ssl_error(option): |