Skip to content

Commit

Permalink
build: clean up config_fips.gypi
Browse files Browse the repository at this point in the history
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: #13837
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
danbev authored and addaleax committed Jun 29, 2017
1 parent 339a7d3 commit 3d93750
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit 3d93750

Please sign in to comment.