Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix finding the static linker for native compiler in cross build 

Native ar and cross ar are not the same!
This commit is contained in:
John Ericson 2019-01-09 15:54:07 -05:00 committed by Jussi Pakkanen
parent b204a74917
commit 8165fa6ad0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mesonbuild/environment.py
View File

@ -1023,7 +1023,8 @@ class Environment:
return comp, cross_comp return comp, cross_comp
def detect_static_linker(self, compiler): def detect_static_linker(self, compiler):
linker = self.binaries.host.lookup_entry('ar') for_machine = MachineChoice.HOST if compiler.is_cross else MachineChoice.BUILD
linker = self.binaries[for_machine].lookup_entry('ar')
if linker is not None: if linker is not None:
linkers = [linker] linkers = [linker]
else: else: