diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-10-10 03:34:01 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-10-10 10:00:28 -0700 |
| commit | 17f766105f0f96eaa2ed41b4f5fb23f98944888e (patch) | |
| tree | 76832b5f0c525250e607bbc89cd342236b04eb06 /mesonbuild | |
| parent | 508662f277e789acc7e49ffbf58de4752f0891fc (diff) | |
| download | meson-17f766105f0f96eaa2ed41b4f5fb23f98944888e.zip meson-17f766105f0f96eaa2ed41b4f5fb23f98944888e.tar.gz meson-17f766105f0f96eaa2ed41b4f5fb23f98944888e.tar.bz2 | |
intel-cl: correct argument order
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/compilers/fortran.py | 4 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index 093bbc9..57700f9 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -32,7 +32,7 @@ from .mixins.pgi import PGICompiler from .. import mlog from mesonbuild.mesonlib import ( - EnvironmentException, MachineChoice, is_osx, LibType + EnvironmentException, MachineChoice, LibType ) if typing.TYPE_CHECKING: @@ -296,7 +296,7 @@ class IntelClFortranCompiler(IntelVisualStudioLikeCompiler, FortranCompiler): def __init__(self, exelist, version, for_machine: MachineChoice, is_cross, target: str, info: 'MachineInfo', exe_wrapper=None, **kwargs): - FortranCompiler.__init__(self, exelist, for_machine, version, + FortranCompiler.__init__(self, exelist, version, for_machine, is_cross, info, exe_wrapper, **kwargs) IntelVisualStudioLikeCompiler.__init__(self, target) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 3ee6d7d..4f14535 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -972,8 +972,8 @@ class Environment: cls = IntelClCCompiler if lang == 'c' else IntelClCPPCompiler linker = XilinkDynamicLinker(for_machine, version=version) return cls( - compiler, version, for_machine, is_cross, exe_wrap, - target, info, linker=linker) + compiler, version, for_machine, is_cross, info=info, + exe_wrap=exe_wrap, target=target, linker=linker) if 'Microsoft' in out or 'Microsoft' in err: # Latest versions of Visual Studio print version # number to stderr but earlier ones print version |