diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-05-18 23:17:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 23:17:34 +0300 |
| commit | 751ea3df72f336fb038739f61b3901e2ff8e10c0 (patch) | |
| tree | c30b93d720bc1719645a00f2861c615ef07c119e /mesonbuild/compilers/mixins | |
| parent | bf34b971121d46d54f8870cd1faf420d6c0bafe5 (diff) | |
| parent | ac8319add14c80369f9d3e8e8c034a2fcb47ef9d (diff) | |
| download | meson-751ea3df72f336fb038739f61b3901e2ff8e10c0.zip meson-751ea3df72f336fb038739f61b3901e2ff8e10c0.tar.gz meson-751ea3df72f336fb038739f61b3901e2ff8e10c0.tar.bz2 | |
Merge pull request #7103 from dankegel/bug4027-rpath-remember
Let .pc files and LDFLAGS provide rpaths.
Diffstat (limited to 'mesonbuild/compilers/mixins')
| -rw-r--r-- | mesonbuild/compilers/mixins/islinker.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/mixins/islinker.py b/mesonbuild/compilers/mixins/islinker.py index 681c816..bf1d339 100644 --- a/mesonbuild/compilers/mixins/islinker.py +++ b/mesonbuild/compilers/mixins/islinker.py @@ -107,8 +107,8 @@ class BasicLinkerIsCompilerMixin: def build_rpath_args(self, env: 'Environment', build_dir: str, from_dir: str, rpath_paths: str, build_rpath: str, - install_rpath: str) -> T.List[str]: - return [] + install_rpath: str) -> T.Tuple[T.List[str], T.Set[bytes]]: + return ([], set()) def get_linker_debug_crt_args(self) -> T.List[str]: return [] |