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/linkers.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/linkers.py')
| -rw-r--r-- | mesonbuild/linkers.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index 5432514..c6302bf 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -26,8 +26,9 @@ class StaticLinker: class VisualStudioLinker(StaticLinker): always_args = ['/NOLOGO'] - def __init__(self, exelist): + def __init__(self, exelist, machine): self.exelist = exelist + self.machine = machine def get_exelist(self): return self.exelist[:] @@ -39,7 +40,11 @@ class VisualStudioLinker(StaticLinker): return [] def get_output_args(self, target): - return ['/OUT:' + target] + args = [] + if self.machine: + args += ['/MACHINE:' + self.machine] + args += ['/OUT:' + target] + return args def get_coverage_link_args(self): return [] |