diff options
| author | Bruce Richardson <bruce.richardson@intel.com> | 2018-08-19 20:41:50 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-08-22 12:24:43 -0700 |
| commit | 8c9296e8e6a03a23615082f5155fd2a974136678 (patch) | |
| tree | f429d22005e40be4cb63ac3fe5dbc8cc6f45cbe5 /mesonbuild/backend/ninjabackend.py | |
| parent | 05b54b4767ff9bd14f0c037d0c2b86447a077b66 (diff) | |
| download | meson-8c9296e8e6a03a23615082f5155fd2a974136678.zip meson-8c9296e8e6a03a23615082f5155fd2a974136678.tar.gz meson-8c9296e8e6a03a23615082f5155fd2a974136678.tar.bz2 | |
find_library: Use _build_wrapper to get library dirs
This means that we will take into account all the flags set in the
cross file when fetching the list of library dirs, which means we
won't incorrectly look for 64-bit libraries when building for 32-bit.
Signed-off-by: Nirbheek Chauhan <nirbheek@centricular.com>
Closes https://github.com/mesonbuild/meson/issues/3881
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index ace0693..824145a 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2333,7 +2333,7 @@ rule FORTRAN_DEP_HACK%s guessed_dependencies = [] # TODO The get_library_naming requirement currently excludes link targets that use d or fortran as their main linker if hasattr(linker, 'get_library_naming'): - search_dirs = list(search_dirs) + linker.get_library_dirs() + search_dirs = list(search_dirs) + linker.get_library_dirs(self.environment) static_patterns = linker.get_library_naming(self.environment, 'static', strict=True) shared_patterns = linker.get_library_naming(self.environment, 'shared', strict=True) for libname in libs: |