zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

find_libraries: search for both .so and .dylib on macOS (#28924)

Browse Source
This commit is contained in:
Adam J. Stewart 2022-02-16 07:07:44 -06:00 committed by GitHub
parent e6ea4c788a
commit 3c1b2c0fc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/spack/llnl/util/filesystem.py
View File

@ -1638,12 +1638,18 @@ def find_libraries(libraries, root, shared=True, recursive=False):
raise TypeError(message) raise TypeError(message)
# Construct the right suffix for the library # Construct the right suffix for the library
if shared is True: if shared:
suffix = 'dylib' if sys.platform == 'darwin' else 'so' # Used on both Linux and macOS
suffixes = ['so']
if sys.platform == 'darwin':
# Only used on macOS
suffixes.append('dylib')
else: else:
suffix = 'a' suffixes = ['a']
# List of libraries we are searching with suffixes # List of libraries we are searching with suffixes
libraries = ['{0}.{1}'.format(lib, suffix) for lib in libraries] libraries = ['{0}.{1}'.format(lib, suffix) for lib in libraries
for suffix in suffixes]
if not recursive: if not recursive:
# If not recursive, look for the libraries directly in root # If not recursive, look for the libraries directly in root