diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2019-12-02 15:00:16 -0800 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2019-12-03 13:08:42 -0800 |
commit | 8091b4c7448ca467bbfff22283beaa702533f177 (patch) | |
tree | df4d737be1b7392347d852c3343d7cf6eacf782e /run_unittests.py | |
parent | 71e3fac5af1027f88a48c0beb78c3994cea57629 (diff) | |
download | meson-8091b4c7448ca467bbfff22283beaa702533f177.zip meson-8091b4c7448ca467bbfff22283beaa702533f177.tar.gz meson-8091b4c7448ca467bbfff22283beaa702533f177.tar.bz2 |
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.
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-x | run_unittests.py | 4 |
1 files changed, 2 insertions, 2 deletions
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) |