diff options
| author | LuÃs Ferreira <lsferreira169@gmail.com> | 2019-02-05 20:51:58 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-02-05 21:50:21 +0000 |
| commit | 8a4a75cc59e7c1951deb58a5918ebe1b67a81881 (patch) | |
| tree | 1db8a5e1ceb6e52376e403d758dbfa3e629ace2f | |
| parent | 70e6f4198c13c42e1640e4c80ada8f772b77042b (diff) | |
| download | meson-8a4a75cc59e7c1951deb58a5918ebe1b67a81881.zip meson-8a4a75cc59e7c1951deb58a5918ebe1b67a81881.tar.gz meson-8a4a75cc59e7c1951deb58a5918ebe1b67a81881.tar.bz2 | |
dub: fix detecting packages with different compilers and archs
Fix 'not founded' message for packages with another name for
specific configurations instead of just 'library'.
Signed-off-by: LuÃs Ferreira <lsferreira169@gmail.com>
| -rw-r--r-- | mesonbuild/dependencies/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 9da0d7c..8196124 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1674,9 +1674,9 @@ class DubDependency(ExternalDependency): return '' # Ex.: library-debug-linux.posix-x86_64-ldc_2081-EF934983A3319F8F8FF2F0E107A363BA - build_name = 'library-{}-{}-{}-{}_{}'.format(description['buildType'], '.'.join(description['platform']), '.'.join(description['architecture']), comp, d_ver) + build_name = '-{}-{}-{}-{}_{}'.format(description['buildType'], '.'.join(description['platform']), '.'.join(description['architecture']), comp, d_ver) for entry in os.listdir(module_build_path): - if entry.startswith(build_name): + if build_name in entry: for file in os.listdir(os.path.join(module_build_path, entry)): if file == lib_file_name: if folder_only: |