diff options
| author | Noam Meltzer <tsnoam@gmail.com> | 2016-06-12 22:45:17 +0300 |
|---|---|---|
| committer | Noam Meltzer <tsnoam@gmail.com> | 2016-06-16 20:52:03 +0300 |
| commit | 038e575d7802bf27e3e0d792c77522f4e13e4ca4 (patch) | |
| tree | a7b527e4de13fc151ff2b5a2338e66923552e825 | |
| parent | 24f2a6bf023933f5de9ec5984d1a08f768ada63d (diff) | |
| download | meson-038e575d7802bf27e3e0d792c77522f4e13e4ca4.zip meson-038e575d7802bf27e3e0d792c77522f4e13e4ca4.tar.gz meson-038e575d7802bf27e3e0d792c77522f4e13e4ca4.tar.bz2 | |
determine_linker(): choose static cross linker for cross compiling
somewhere after 0.29.0 a bug was introduced where the LINK_ARGS of the
native static linker were used instead of the cross static linker
| -rw-r--r-- | mesonbuild/backend/backends.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 4ff1553..6f109ad 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -226,7 +226,10 @@ class Backend(): def determine_linker(self, target, src): if isinstance(target, build.StaticLibrary): - return self.build.static_linker + if self.build.static_cross_linker is not None: + return self.build.static_cross_linker + else: + return self.build.static_linker if len(self.build.compilers) == 1: return self.build.compilers[0] # Currently a bit naive. C++ must |