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/environment.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/environment.py')
-rw-r--r-- | mesonbuild/environment.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index a26787c..9c969ad 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -905,11 +905,11 @@ This is probably wrong, it should always point to the native compiler.''' % evar if p.returncode == 0 and ('armar' in linker or 'armar.exe' in linker): return ArmarLinker(linker) if 'DMD32 D Compiler' in out or 'DMD64 D Compiler' in out: - return DLinker(linker, compiler.is_64, compiler.is_msvc) + return DLinker(linker, compiler.arch) if 'LDC - the LLVM D compiler' in out: - return DLinker(linker, compiler.is_64, compiler.is_msvc) + return DLinker(linker, compiler.arch) if 'GDC' in out and ' based on D ' in out: - return DLinker(linker, compiler.is_64, compiler.is_msvc) + return DLinker(linker, compiler.arch) if p.returncode == 0: return ArLinker(linker) if p.returncode == 1 and err.startswith('usage'): # OSX |