diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-01 01:11:02 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-01 01:11:02 +0300 |
| commit | cb64a3f07a91c01c84f80d5303aaf5f0fe5ee100 (patch) | |
| tree | 44a34ec3a7813414695abc7c9198117c0d3cdcf1 /mesonbuild/backend/backends.py | |
| parent | b3362e350ad0c8603966bc485e66af553750c648 (diff) | |
| download | meson-cb64a3f07a91c01c84f80d5303aaf5f0fe5ee100.zip meson-cb64a3f07a91c01c84f80d5303aaf5f0fe5ee100.tar.gz meson-cb64a3f07a91c01c84f80d5303aaf5f0fe5ee100.tar.bz2 | |
Fix MSVC builds.
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 562e467..c737d49 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -306,7 +306,7 @@ class Backend: if len(la) == 1 and la[0].startswith(self.environment.get_source_dir()): # The only link argument is an absolute path to a library file. libpath = la[0] - if not(libpath.lower().endswith('.dll') or libpath.lower().endswith('.so')): + if os.path.splitext(libpath)[1] not in ['.dll', '.lib', '.so']: continue absdir = os.path.split(libpath)[0] rel_to_src = absdir[len(self.environment.get_source_dir())+1:] @@ -530,6 +530,8 @@ class Backend: dirseg = os.path.join(self.environment.get_build_dir(), self.get_target_dir(ld)) if dirseg not in result: result.append(dirseg) + for deppath in self.rpaths_for_bundled_shared_libraries(target): + result.append(os.path.normpath(os.path.join(self.environment.get_build_dir(), deppath))) return result def write_benchmark_file(self, datafile): |