aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorAlistair Thomas <astavale@yahoo.co.uk>2017-06-21 19:02:29 +0100
committerAlistair Thomas <astavale@yahoo.co.uk>2017-06-22 20:09:58 +0100
commite5559903b3857a333c6cbc88b44d6759c293e5df (patch)
tree140a008acba1b48631836456678bc1926babb684 /run_unittests.py
parent080307dd71d9b41a103369863137ed5b73eb131a (diff)
downloadmeson-e5559903b3857a333c6cbc88b44d6759c293e5df.zip
meson-e5559903b3857a333c6cbc88b44d6759c293e5df.tar.gz
meson-e5559903b3857a333c6cbc88b44d6759c293e5df.tar.bz2
Split linkers out from compilers.py
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 63462d8..93a43ae 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -701,7 +701,7 @@ class AllPlatformTests(BasePlatformTests):
static_linker = env.detect_static_linker(cc)
if is_windows():
raise unittest.SkipTest('https://github.com/mesonbuild/meson/issues/1526')
- if not isinstance(static_linker, mesonbuild.compilers.ArLinker):
+ if not isinstance(static_linker, mesonbuild.linkers.ArLinker):
raise unittest.SkipTest('static linker is not `ar`')
# Configure
self.init(testdir)
@@ -936,8 +936,8 @@ class AllPlatformTests(BasePlatformTests):
clang = mesonbuild.compilers.ClangCompiler
intel = mesonbuild.compilers.IntelCompiler
msvc = mesonbuild.compilers.VisualStudioCCompiler
- ar = mesonbuild.compilers.ArLinker
- lib = mesonbuild.compilers.VisualStudioLinker
+ ar = mesonbuild.linkers.ArLinker
+ lib = mesonbuild.linkers.VisualStudioLinker
langs = [('c', 'CC'), ('cpp', 'CXX')]
if not is_windows():
langs += [('objc', 'OBJC'), ('objcpp', 'OBJCXX')]