diff options
| author | Peter Harris <pharris@opentext.com> | 2020-08-12 19:49:35 -0400 |
|---|---|---|
| committer | Peter Harris <pharris@opentext.com> | 2020-08-12 21:13:07 -0400 |
| commit | 0f90299b1c5ba98a685e6545fcc6eda5acbe996d (patch) | |
| tree | 58c76111d253d27f25a05dc42d85332da9fac376 /mesonbuild/environment.py | |
| parent | abe72d5c8415c83f268d01b266e2fa5f5892de46 (diff) | |
| download | meson-0f90299b1c5ba98a685e6545fcc6eda5acbe996d.zip meson-0f90299b1c5ba98a685e6545fcc6eda5acbe996d.tar.gz meson-0f90299b1c5ba98a685e6545fcc6eda5acbe996d.tar.bz2 | |
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.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index bf49de9..00573f7 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -19,7 +19,7 @@ import typing as T import collections from . import coredata -from .linkers import ArLinker, ArmarLinker, VisualStudioLinker, DLinker, CcrxLinker, Xc16Linker, C2000Linker, IntelVisualStudioLinker +from .linkers import ArLinker, ArmarLinker, VisualStudioLinker, DLinker, CcrxLinker, Xc16Linker, C2000Linker, IntelVisualStudioLinker, AIXArLinker from . import mesonlib from .mesonlib import ( MesonException, EnvironmentException, MachineChoice, Popen_safe, @@ -1940,7 +1940,7 @@ class Environment: if p.returncode == 1 and err.startswith('usage'): # OSX return ArLinker(linker) if p.returncode == 1 and err.startswith('Usage'): # AIX - return ArLinker(linker) + return AIXArLinker(linker) if p.returncode == 1 and err.startswith('ar: bad option: --'): # Solaris return ArLinker(linker) self._handle_exceptions(popen_exceptions, linkers, 'linker') |