diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-09-05 23:45:54 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-05 23:45:54 +0300 |
commit | d67d5411bb7fa00226365ebcfc475af08a4ba721 (patch) | |
tree | f0636ff994401375e4e1d38cb7d4559e58462d67 /mesonbuild/backend/ninjabackend.py | |
parent | 7b765155347005e01bdd9ae8bfdad7182f27f852 (diff) | |
parent | b9af8f8b6b394903d64e4886712b38a056cd876f (diff) | |
download | meson-d67d5411bb7fa00226365ebcfc475af08a4ba721.zip meson-d67d5411bb7fa00226365ebcfc475af08a4ba721.tar.gz meson-d67d5411bb7fa00226365ebcfc475af08a4ba721.tar.bz2 |
Merge pull request #5823 from scivision/linker-pgi-linux
PGI compiler fixes
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 98f244d..17b4986 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -28,7 +28,8 @@ from .. import build from .. import mlog from .. import dependencies from .. import compilers -from ..compilers import Compiler, CompilerArgs, CCompiler, VisualStudioLikeCompiler, FortranCompiler +from ..compilers import (Compiler, CompilerArgs, CCompiler, FortranCompiler, + PGICCompiler, VisualStudioLikeCompiler) from ..linkers import ArLinker from ..mesonlib import ( File, LibType, MachineChoice, MesonException, OrderedSet, PerMachine, ProgressBar, quote_arg @@ -234,6 +235,9 @@ class NinjaBackend(backends.Backend): # IFort on windows is MSVC like, but doesn't have /showincludes if isinstance(compiler, FortranCompiler): continue + if isinstance(compiler, PGICCompiler) and mesonlib.is_windows(): + # for the purpose of this function, PGI doesn't act enough like MSVC + return open(tempfilename, 'a', encoding='utf-8') if isinstance(compiler, VisualStudioLikeCompiler): break else: |