diff options
| author | GoaLitiuM <goalitium@kapsi.fi> | 2018-09-20 12:53:43 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-09-20 19:00:12 +0300 |
| commit | bc4bf03871883b045d3d90b8ff4884d38a1d5484 (patch) | |
| tree | 4dbce8de844a8cdecbf923c8bfc3acc1212ef840 /mesonbuild/linkers.py | |
| parent | 83ad728e19c4be782dff6c582cfc298bc58f3cfb (diff) | |
| download | meson-bc4bf03871883b045d3d90b8ff4884d38a1d5484.zip meson-bc4bf03871883b045d3d90b8ff4884d38a1d5484.tar.gz meson-bc4bf03871883b045d3d90b8ff4884d38a1d5484.tar.bz2 | |
D: Fix incorrect arch handling in D linkers
Diffstat (limited to 'mesonbuild/linkers.py')
| -rw-r--r-- | mesonbuild/linkers.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index 30ca5d8..66586e4 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -139,11 +139,10 @@ class ArmarLinker(ArLinker): return False class DLinker(StaticLinker): - def __init__(self, exelist, is_64, is_msvc): + def __init__(self, exelist, arch): self.exelist = exelist self.id = exelist[0] - self.is_64 = is_64 - self.is_msvc = is_msvc + self.arch = arch def can_linker_accept_rsp(self): return mesonlib.is_windows() @@ -165,9 +164,9 @@ class DLinker(StaticLinker): def get_linker_always_args(self): if is_windows(): - if self.is_64: + if self.arch == 'x86_64': return ['-m64'] - elif self.is_msvc and self.id == 'dmd': + elif self.arch == 'x86_mscoff' and self.id == 'dmd': return ['-m32mscoff'] return ['-m32'] return [] |