diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-23 19:00:02 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-23 19:02:31 +0530 |
| commit | 102b86235440a049dc4fe0f605b78de046a05c31 (patch) | |
| tree | be427f3e47226d716cc7484605502d949ff9f3ae | |
| parent | 1677c61409b55fd80c499626cdedbfb568c70874 (diff) | |
| download | meson-nirbheek/rpath-bugfixes.tar.gz | |
backends: Also accept dylibs while finding RPATHsnirbheek/rpath-bugfixes
| -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 a7f9ba1c4..02ce52d4f 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -344,7 +344,9 @@ class Backend: if libpath.startswith(('/usr/lib', '/lib')): # No point in adding system paths. continue - if os.path.splitext(libpath)[1] not in ['.dll', '.lib', '.so']: + # Windows doesn't support rpaths, but we use this function to + # emulate rpaths by setting PATH, so also accept DLLs here + if os.path.splitext(libpath)[1] not in ['.dll', '.lib', '.so', '.dylib']: continue absdir = os.path.dirname(libpath) if absdir.startswith(self.environment.get_source_dir()): |