aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-09-01 15:19:38 -0400
committerMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-09-05 11:50:17 -0400
commitc8d380e4ef11cd1a72c785418f41dd420fbf6d1b (patch)
tree228197eb356c56d842588e4c014945072e7ff994 /mesonbuild/environment.py
parentcaec875fe1922b40037e1fd9229433ede64f9f25 (diff)
downloadmeson-c8d380e4ef11cd1a72c785418f41dd420fbf6d1b.zip
meson-c8d380e4ef11cd1a72c785418f41dd420fbf6d1b.tar.gz
meson-c8d380e4ef11cd1a72c785418f41dd420fbf6d1b.tar.bz2
PGI: use ar link wrapper on Windows
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 7e1ca9d..9efc94e 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -51,6 +51,7 @@ from .linkers import (
MSVCDynamicLinker,
OptlinkDynamicLinker,
PGIDynamicLinker,
+ PGIStaticLinker,
SolarisDynamicLinker,
XildAppleDynamicLinker,
XildLinuxDynamicLinker,
@@ -1340,6 +1341,8 @@ class Environment:
elif isinstance(compiler, IntelClCCompiler):
# Intel has it's own linker that acts like microsoft's lib
linkers = ['xilib']
+ elif isinstance(compiler, (PGICCompiler, PGIFortranCompiler)) and mesonlib.is_windows():
+ linkers = [self.default_static_linker] # this is just a wrapper calling link/lib on Windows, keeping things simple.
else:
linkers = [self.default_static_linker]
popen_exceptions = {}
@@ -1357,6 +1360,8 @@ class Environment:
return IntelVisualStudioLinker(linker, getattr(compiler, 'machine', None))
if '/OUT:' in out.upper() or '/OUT:' in err.upper():
return VisualStudioLinker(linker, getattr(compiler, 'machine', None))
+ if 'ar-Error-Unknown switch: --version' in err:
+ return PGIStaticLinker(linker)
if p.returncode == 0 and ('armar' in linker or 'armar.exe' in linker):
return ArmarLinker(linker)
if 'DMD32 D Compiler' in out or 'DMD64 D Compiler' in out: