diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-11-02 23:35:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-02 23:35:38 +0200 |
| commit | f5c88932810ded5ea3d4a2f4a8f0350635c3c44a (patch) | |
| tree | 5ac2d4465b2298c2d78dd2715367f36561977800 /mesonbuild/environment.py | |
| parent | bbe6db08e39179191f60e397b8837b5a685760d1 (diff) | |
| parent | 50225c14e23c51cc9d389488b85768d8c72215c0 (diff) | |
| download | meson-f5c88932810ded5ea3d4a2f4a8f0350635c3c44a.zip meson-f5c88932810ded5ea3d4a2f4a8f0350635c3c44a.tar.gz meson-f5c88932810ded5ea3d4a2f4a8f0350635c3c44a.tar.bz2 | |
Merge pull request #6123 from scivision/bugfix-fortran
bugfix: fortran compiler assertionerror from 0c22798
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index a1b46a8..fccca16 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1155,8 +1155,7 @@ class Environment: compiler, for_machine, 'pgi', PGIFortranCompiler.LINKER_PREFIX, version=version) return PGIFortranCompiler( - compiler, version, for_machine, is_cross, - self.machines[for_machine], exe_wrap, + compiler, version, for_machine, is_cross, info, exe_wrap, full_version=full_version, linker=linker) if 'flang' in out or 'clang' in out: @@ -1509,7 +1508,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 = {} |