diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-03-19 20:39:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 20:39:34 +0200 |
| commit | 44dd5535f056922294867bac2eb07b57f21bede6 (patch) | |
| tree | ef603fb176951caac7201046d0204a6e489a7791 /mesonbuild/environment.py | |
| parent | 3d0b110ec2e5e0e9eddc4dcfeb925e6f62dbcba0 (diff) | |
| parent | a223b20bb60c7c643d3d4e9581101e5f54522c57 (diff) | |
| download | meson-44dd5535f056922294867bac2eb07b57f21bede6.zip meson-44dd5535f056922294867bac2eb07b57f21bede6.tar.gz meson-44dd5535f056922294867bac2eb07b57f21bede6.tar.bz2 | |
Merge pull request #4724 from jon-turney/lib-machine-always
Fix linking when cross-compiling and a windows resource is first object
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index ac6e70a..58adb06 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1179,7 +1179,7 @@ class Environment: popen_exceptions[' '.join(linker + [arg])] = e continue if '/OUT:' in out.upper() or '/OUT:' in err.upper(): - return VisualStudioLinker(linker) + return VisualStudioLinker(linker, getattr(compiler, 'machine', None)) 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: |