summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2017-06-21 10:20:56 +0200
committerDaniel Bevenius <daniel.bevenius@gmail.com>2017-06-24 07:51:06 +0200
commit748b2a87ca4effb39186d89f7e16a145a4bf9365 (patch)
treeebe43b9ff216638c1f28f914194efa564d024283 /configure
parentbefede64f14858ffea4e8d6f93700be07e0f85fc (diff)
downloadandroid-node-v8-748b2a87ca4effb39186d89f7e16a145a4bf9365.tar.gz
android-node-v8-748b2a87ca4effb39186d89f7e16a145a4bf9365.tar.bz2
android-node-v8-748b2a87ca4effb39186d89f7e16a145a4bf9365.zip
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-xconfigure5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure
index d1167f961a..c2bc15e61a 100755
--- a/configure
+++ b/configure
@@ -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):