diff options
| author | John Ericson <git@JohnEricson.me> | 2020-08-03 11:48:27 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2020-08-03 11:48:27 -0400 |
| commit | eaf6343c065842b9719793066e765b2e5f1c2f3b (patch) | |
| tree | 1bfeac5297ba489721e704e63c28f33d0fb98990 /mesonbuild/compilers/mixins/islinker.py | |
| parent | 87aa98c1787d800145853a8e84654e4c54ee1078 (diff) | |
| parent | 70edf82c6c77902cd64f44848302bbac92d611d8 (diff) | |
| download | meson-lang-enum.zip meson-lang-enum.tar.gz meson-lang-enum.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into lang-enumlang-enum
Diffstat (limited to 'mesonbuild/compilers/mixins/islinker.py')
| -rw-r--r-- | mesonbuild/compilers/mixins/islinker.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mesonbuild/compilers/mixins/islinker.py b/mesonbuild/compilers/mixins/islinker.py index 681c816..a9967d6 100644 --- a/mesonbuild/compilers/mixins/islinker.py +++ b/mesonbuild/compilers/mixins/islinker.py @@ -107,11 +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 [] - - def get_linker_debug_crt_args(self) -> T.List[str]: - return [] + install_rpath: str) -> T.Tuple[T.List[str], T.Set[bytes]]: + return ([], set()) def get_asneeded_args(self) -> T.List[str]: return [] |