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 /run_project_tests.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 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 2dff885..10dc8c6 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -114,7 +114,8 @@ def get_relative_files_list_from_dir(fromdir: Path) -> typing.List[Path]: def platform_fix_name(fname: str, compiler, env) -> str: # canonicalize compiler - if compiler in {'clang-cl', 'intel-cl'}: + if (compiler in {'clang-cl', 'intel-cl'} or + (env.machines.host.is_windows() and compiler == 'pgi')): canonical_compiler = 'msvc' else: canonical_compiler = compiler |