aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-10-29 15:52:53 -0700
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2019-07-23 09:58:24 +0000
commite0f036f3a4806c298961a61ccc8e7e38ab4b4587 (patch)
tree7bf1aed2693fcb2a2808b5f9fb7f3a7fbf5ecc70 /mesonbuild
parent5d7395673da102308ee03bab867fc46ff3e44e3a (diff)
downloadmeson-e0f036f3a4806c298961a61ccc8e7e38ab4b4587.zip
meson-e0f036f3a4806c298961a61ccc8e7e38ab4b4587.tar.gz
meson-e0f036f3a4806c298961a61ccc8e7e38ab4b4587.tar.bz2
linkers: Always use mesonlib namespace
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/linkers.py5
1 files changed, 2 insertions, 3 deletions
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':