From 8091b4c7448ca467bbfff22283beaa702533f177 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 2 Dec 2019 15:00:16 -0800 Subject: Intel: Dump worthless Xild abstractions This dumps xild on mac and linux. After a lot of reading and banging my head I've discovered we (meson) don't care about xild, xild is only useful if your invoke ld directly (not through icc/icpc) and you want to do ipo/lto/wpo. Instead just make icc report what it's actually doing, invoking ld or ld64 (for linux and mac respectively) directly. This allows us to get -fuse-ld working on linux. --- run_unittests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'run_unittests.py') diff --git a/run_unittests.py b/run_unittests.py index 74e5803..bf91613 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2299,11 +2299,11 @@ class AllPlatformTests(BasePlatformTests): if isinstance(cc, intel): self.assertIsInstance(linker, ar) if is_osx(): - self.assertIsInstance(cc.linker, mesonbuild.linkers.XildAppleDynamicLinker) + self.assertIsInstance(cc.linker, mesonbuild.linkers.AppleDynamicLinker) elif is_windows(): self.assertIsInstance(cc.linker, mesonbuild.linkers.XilinkDynamicLinker) else: - self.assertIsInstance(cc.linker, mesonbuild.linkers.XildLinuxDynamicLinker) + self.assertIsInstance(cc.linker, mesonbuild.linkers.GnuDynamicLinker) if isinstance(cc, msvc): self.assertTrue(is_windows()) self.assertIsInstance(linker, lib) -- cgit v1.1