Skip to content

Commit

Permalink
use generation target to detect and sanity check OpenSSL executable
Browse files Browse the repository at this point in the history
  • Loading branch information
lexming committed May 29, 2024
1 parent 48bc68d commit 3128f50
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions easybuild/easyblocks/o/openssl_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def __init__(self, *args, **kwargs):
return

# Check system OpenSSL binary
target_ssl_bins = ['openssl']
target_ssl_bins = [self.generation_targets['bin']]
if self.generation == '1.1':
target_ssl_bins.insert(0, 'openssl11') # prefer 'openssl11' over 'openssl' with v1.1
elif self.generation == '3':
Expand Down Expand Up @@ -383,7 +383,7 @@ def sanity_check_step(self):
ssl_libs = ['%s.%s' % (solib.split('.')[0], shlib_ext) for solib in self.generation_targets['libs']]
ssl_libs.extend(self.generation_targets['libs'])

ssl_files = [os.path.join('bin', self.name.lower())]
ssl_files = [os.path.join('bin', self.generation_targets['bin'])]
ssl_files.extend(os.path.join('lib', libso) for libso in ssl_libs)

ssl_dirs = [
Expand Down

0 comments on commit 3128f50

Please sign in to comment.