diff options
| author | David Seifert <soap@gentoo.org> | 2018-09-16 11:39:54 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-09-16 18:27:19 +0300 |
| commit | 8f16d0f3c99666c36f37ef10df0b916e88c1afaa (patch) | |
| tree | 58ed5d4066c2db116e9f3cec614c46a33ad5cffa /mesonbuild/environment.py | |
| parent | 2b9fb36267c8661604ef53a7ddbd3a65f7b910dc (diff) | |
| download | meson-8f16d0f3c99666c36f37ef10df0b916e88c1afaa.zip meson-8f16d0f3c99666c36f37ef10df0b916e88c1afaa.tar.gz meson-8f16d0f3c99666c36f37ef10df0b916e88c1afaa.tar.bz2 | |
Fix ICC on macOS
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 81ba54c..a26787c 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -602,8 +602,13 @@ This is probably wrong, it should always point to the native compiler.''' % evar cls = VisualStudioCCompiler if lang == 'c' else VisualStudioCPPCompiler return cls(compiler, version, is_cross, exe_wrap, is_64) if '(ICC)' in out: - # TODO: add microsoft add check OSX - compiler_type = CompilerType.ICC_STANDARD + if mesonlib.for_darwin(want_cross, self): + compiler_type = CompilerType.ICC_OSX + elif mesonlib.for_windows(want_cross, self): + # TODO: fix ICC on Windows + compiler_type = CompilerType.ICC_WIN + else: + compiler_type = CompilerType.ICC_STANDARD cls = IntelCCompiler if lang == 'c' else IntelCPPCompiler return cls(ccache + compiler, version, compiler_type, is_cross, exe_wrap, full_version=full_version) if 'ARM' in out: |