From 0f90299b1c5ba98a685e6545fcc6eda5acbe996d Mon Sep 17 00:00:00 2001 From: Peter Harris Date: Wed, 12 Aug 2020 19:49:35 -0400 Subject: aix: allow both 32-bit and 64-bit objects in a static library Without the -Xany flag, the ar command will complain when an .o file is compiled for the non-default bit width. This change is necessary to allow 64-bit builds via a native (or cross) file. --- mesonbuild/linkers.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'mesonbuild/linkers.py') diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index 84c6538..535174d 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -247,6 +247,18 @@ class C2000Linker(StaticLinker): return ['-r'] +class AIXArLinker(ArLinker): + + def __init__(self, exelist: T.List[str]): + StaticLinker.__init__(self, exelist) + self.id = 'aixar' + self.std_args = ['-csr', '-Xany'] + + def can_linker_accept_rsp(self) -> bool: + # AIXAr can't accept arguments using the @rsp syntax + return False + + def prepare_rpaths(raw_rpaths: str, build_dir: str, from_dir: str) -> T.List[str]: # The rpaths we write must be relative if they point to the build dir, # because otherwise they have different length depending on the build -- cgit v1.1