From abe72d5c8415c83f268d01b266e2fa5f5892de46 Mon Sep 17 00:00:00 2001 From: Peter Harris Date: Mon, 10 Aug 2020 19:03:09 -0400 Subject: aix: detect and support the AIX dynamic linker --- mesonbuild/environment.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'mesonbuild/environment.py') diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 315f6c5..bf49de9 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -61,6 +61,7 @@ from .linkers import ( PGIDynamicLinker, PGIStaticLinker, SolarisDynamicLinker, + AIXDynamicLinker, XilinkDynamicLinker, CudaLinker, VisualStudioLikeLinkerMixin, @@ -1092,6 +1093,14 @@ class Environment: linker = SolarisDynamicLinker( compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v) + elif 'ld: 0706-012 The -- flag is not recognized' in e: + if isinstance(comp_class.LINKER_PREFIX, str): + _, _, e = Popen_safe(compiler + [comp_class.LINKER_PREFIX + '-V'] + extra_args) + else: + _, _, e = Popen_safe(compiler + comp_class.LINKER_PREFIX + ['-V'] + extra_args) + linker = AIXDynamicLinker( + compiler, for_machine, comp_class.LINKER_PREFIX, override, + version=search_version(e)) else: raise EnvironmentException('Unable to determine dynamic linker') return linker -- cgit v1.1