Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

intel-cl: correct argument order

This commit is contained in:
Michael Hirsch, Ph.D 2019-10-10 03:34:01 -04:00 committed by Dylan Baker
parent 508662f277
commit 17f766105f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mesonbuild/compilers/fortran.py
View File

@ -32,7 +32,7 @@ from .mixins.pgi import PGICompiler
from .. import mlog from .. import mlog
from mesonbuild.mesonlib import ( from mesonbuild.mesonlib import (
EnvironmentException, MachineChoice, is_osx, LibType EnvironmentException, MachineChoice, LibType
) )
if typing.TYPE_CHECKING: if typing.TYPE_CHECKING:
@ -296,7 +296,7 @@ class IntelClFortranCompiler(IntelVisualStudioLikeCompiler, FortranCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice, def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross, target: str, info: 'MachineInfo', exe_wrapper=None, is_cross, target: str, info: 'MachineInfo', exe_wrapper=None,
**kwargs): **kwargs):
FortranCompiler.__init__(self, exelist, for_machine, version, FortranCompiler.__init__(self, exelist, version, for_machine,
is_cross, info, exe_wrapper, **kwargs) is_cross, info, exe_wrapper, **kwargs)
IntelVisualStudioLikeCompiler.__init__(self, target) IntelVisualStudioLikeCompiler.__init__(self, target)

4
mesonbuild/environment.py
View File

@ -972,8 +972,8 @@ class Environment:
cls = IntelClCCompiler if lang == 'c' else IntelClCPPCompiler cls = IntelClCCompiler if lang == 'c' else IntelClCPPCompiler
linker = XilinkDynamicLinker(for_machine, version=version) linker = XilinkDynamicLinker(for_machine, version=version)
return cls( return cls(
compiler, version, for_machine, is_cross, exe_wrap, compiler, version, for_machine, is_cross, info=info,
target, info, linker=linker) exe_wrap=exe_wrap, target=target, linker=linker)
if 'Microsoft' in out or 'Microsoft' in err: if 'Microsoft' in out or 'Microsoft' in err:
# Latest versions of Visual Studio print version # Latest versions of Visual Studio print version
# number to stderr but earlier ones print version # number to stderr but earlier ones print version