aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-10-31 23:53:47 -0400
committerMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-10-31 23:53:47 -0400
commit50225c14e23c51cc9d389488b85768d8c72215c0 (patch)
tree078f45b0953ac0d916fe526507708a4a2028a37d /mesonbuild/environment.py
parent9c1bab67afad3933a08b24a846a7e0d255ccb5e2 (diff)
downloadmeson-50225c14e23c51cc9d389488b85768d8c72215c0.zip
meson-50225c14e23c51cc9d389488b85768d8c72215c0.tar.gz
meson-50225c14e23c51cc9d389488b85768d8c72215c0.tar.bz2
fix PGI Windows 'ar' linker
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index b7629c8..1d026b0 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -1504,7 +1504,7 @@ class Environment:
# 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.
+ linkers = [['ar']] # For PGI on Windows, "ar" is just a wrapper calling link/lib.
else:
linkers = defaults
popen_exceptions = {}