diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2021-01-11 11:09:16 -0800 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2021-01-11 11:15:06 -0800 |
commit | 9f343212e071cfee99e0be76de0f61bec9a6d5f2 (patch) | |
tree | c2a4363fea7e7bb97d9fb81fb3c6e2ec4017fd77 | |
parent | 72365e6856e688054938f6055af66f0ac83d261e (diff) | |
download | meson-9f343212e071cfee99e0be76de0f61bec9a6d5f2.zip meson-9f343212e071cfee99e0be76de0f61bec9a6d5f2.tar.gz meson-9f343212e071cfee99e0be76de0f61bec9a6d5f2.tar.bz2 |
unittests: Clang on windows can use either ld or link.exe
it generally uses the ld style linkers with msys2 and link.exe style
linkers otherwise, but anything's possible.
-rwxr-xr-x | run_unittests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py index 27c0677..5118b00 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2606,8 +2606,10 @@ class AllPlatformTests(BasePlatformTests): if is_osx(): self.assertIsInstance(cc.linker, mesonbuild.linkers.AppleDynamicLinker) elif is_windows(): - # This is clang, not clang-cl - self.assertIsInstance(cc.linker, mesonbuild.linkers.MSVCDynamicLinker) + # This is clang, not clang-cl. This can be either an + # ld-like linker of link.exe-like linker (usually the + # former for msys2, the latter otherwise) + self.assertIsInstance(cc.linker, (mesonbuild.linkers.MSVCDynamicLinker, mesonbuild.linkers.GnuLikeDynamicLinkerMixin)) else: self.assertIsInstance(cc.linker, mesonbuild.linkers.GnuLikeDynamicLinkerMixin) if isinstance(cc, intel): |