diff options
| author | James Hilliard <james.hilliard1@gmail.com> | 2020-08-16 07:24:07 -0600 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-09-06 21:07:14 +0300 |
| commit | 646ae846bef76b955771c33fdb49d45a394cf6d8 (patch) | |
| tree | 5f0506a805366687a53df472fc15afc7c0971bab | |
| parent | 97177bc12a98738a443cce65d9ee2bee03d0f1f3 (diff) | |
| download | meson-646ae846bef76b955771c33fdb49d45a394cf6d8.zip meson-646ae846bef76b955771c33fdb49d45a394cf6d8.tar.gz meson-646ae846bef76b955771c33fdb49d45a394cf6d8.tar.bz2 | |
backends: check external rpaths for all languages using ldflags
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 | ||||
| -rw-r--r-- | mesonbuild/compilers/__init__.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 6c5b75a..e0bab7c 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -29,6 +29,7 @@ from .. import build from .. import dependencies from .. import mesonlib from .. import mlog +from ..compilers import languages_using_ldflags from ..mesonlib import ( File, MachineChoice, MesonException, OrderedSet, OptionOverrideProxy, classify_unity_sources, unholder @@ -451,8 +452,7 @@ class Backend: def get_external_rpath_dirs(self, target): dirs = set() args = [] - # FIXME: is there a better way? - for lang in ['c', 'cpp']: + for lang in languages_using_ldflags: try: args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang)) except Exception: diff --git a/mesonbuild/compilers/__init__.py b/mesonbuild/compilers/__init__.py index b8d8678..efae0ef 100644 --- a/mesonbuild/compilers/__init__.py +++ b/mesonbuild/compilers/__init__.py @@ -126,6 +126,7 @@ from .compilers import ( is_library, is_known_suffix, lang_suffixes, + languages_using_ldflags, sort_clink, ) from .c import ( |