diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-10-11 10:12:49 -0700 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-11-07 17:18:30 +0530 |
| commit | cf7dc02e2de1015db0d1a559b3f486dc80994e15 (patch) | |
| tree | 01ec0fb0a3aa25651148a06b2adf915c0e64c24d | |
| parent | 00e9feafb397d01258ccae6fbdd7a5fc431a0460 (diff) | |
| download | meson-cf7dc02e2de1015db0d1a559b3f486dc80994e15.zip meson-cf7dc02e2de1015db0d1a559b3f486dc80994e15.tar.gz meson-cf7dc02e2de1015db0d1a559b3f486dc80994e15.tar.bz2 | |
environment: Fix detection of xild with icc
| -rw-r--r-- | mesonbuild/environment.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 03c6568..0033d0b 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -999,13 +999,13 @@ class Environment: linker = PGIDynamicLinker(compiler, for_machine, 'pgi', cls.LINKER_PREFIX, version=version) return cls(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, linker=linker) if '(ICC)' in out: + cls = IntelCCompiler if lang == 'c' else IntelCPPCompiler if self.machines[for_machine].is_darwin(): compiler_type = CompilerType.ICC_OSX l = XildAppleDynamicLinker(compiler, for_machine, 'xild', '-Wl,', version=version) else: compiler_type = CompilerType.ICC_STANDARD l = XildLinuxDynamicLinker(compiler, for_machine, 'xild', '-Wl,', version=version) - cls = IntelCCompiler if lang == 'c' else IntelCPPCompiler return cls(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, full_version=full_version, linker=l) if 'ARM' in out: compiler_type = CompilerType.ARM_WIN |