From 9f343212e071cfee99e0be76de0f61bec9a6d5f2 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 11 Jan 2021 11:09:16 -0800 Subject: [PATCH] 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. --- run_unittests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/run_unittests.py b/run_unittests.py index 27c067711..5118b0096 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):