From e0f036f3a4806c298961a61ccc8e7e38ab4b4587 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Mon, 29 Oct 2018 15:52:53 -0700
Subject: linkers: Always use mesonlib namespace

---
 mesonbuild/linkers.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'mesonbuild/linkers.py')

diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py
index 9529cb7..dc9a825 100644
--- a/mesonbuild/linkers.py
+++ b/mesonbuild/linkers.py
@@ -14,7 +14,6 @@
 
 import typing
 
-from .mesonlib import Popen_safe, is_windows
 from . import mesonlib
 
 if typing.TYPE_CHECKING:
@@ -128,7 +127,7 @@ class ArLinker(StaticLinker):
     def __init__(self, exelist: typing.List[str]):
         super().__init__(exelist)
         self.id = 'ar'
-        pc, stdo = Popen_safe(self.exelist + ['-h'])[0:2]
+        pc, stdo = mesonlib.Popen_safe(self.exelist + ['-h'])[0:2]
         # Enable deterministic builds if they are available.
         if '[D]' in stdo:
             self.std_args = ['csrD']
@@ -167,7 +166,7 @@ class DLinker(StaticLinker):
         return ['-of=' + target]
 
     def get_linker_always_args(self) -> typing.List[str]:
-        if is_windows():
+        if mesonlib.is_windows():
             if self.arch == 'x86_64':
                 return ['-m64']
             elif self.arch == 'x86_mscoff' and self.id == 'dmd':
-- 
cgit v1.1