diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-08-21 08:48:11 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-08-21 20:51:59 +0300 |
| commit | 6864058b1043103410faabf4a8e908f6f24b36bf (patch) | |
| tree | 7c79fea479ba35db4d1dd14bbd0eac7bc6474813 | |
| parent | 3db6dcb3b858c44cd68585dd99280dd82ed8fb33 (diff) | |
| download | meson-6864058b1043103410faabf4a8e908f6f24b36bf.tar.gz | |
Fix type annotations in linkers for python < 3.5.4
Before python 3.5.4 typing didn't have the NoReturn type, use a string
to forward declare it.
aside: I can't wait to be able to use python 3.7's
__future__.annotations and not have to deal wit hthis anymore.
Fixes #5822
| -rw-r--r-- | mesonbuild/linkers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index a641cd007..caf11f114 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -664,7 +664,7 @@ class CcrxDynamicLinker(DynamicLinker): def get_output_args(self, outputname: str) -> typing.List[str]: return ['-output=%s' % outputname] - def get_search_args(self, dirname: str) -> typing.NoReturn: + def get_search_args(self, dirname: str) -> 'typing.NoReturn': raise EnvironmentError('rlink.exe does not have a search dir argument') def get_allow_undefined_args(self) -> typing.List[str]: @@ -688,7 +688,7 @@ class ArmDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker): def get_accepts_rsp(self) -> bool: return False - def get_std_shared_lib_args(self) -> typing.NoReturn: + def get_std_shared_lib_args(self) -> 'typing.NoReturn': raise mesonlib.MesonException('The Arm Linkers do not support shared libraries') def get_allow_undefined_args(self) -> typing.List[str]: |