diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-10-11 10:12:49 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-10-14 08:26:57 -0700 |
| commit | b268327166139816f575add6b2958943efd5a020 (patch) | |
| tree | c4dba99e6bee97d76895b533b70422a974087c72 /mesonbuild/environment.py | |
| parent | ebb1ad528af0a08caae3f94c3e32d5402ed42633 (diff) | |
| download | meson-b268327166139816f575add6b2958943efd5a020.zip meson-b268327166139816f575add6b2958943efd5a020.tar.gz meson-b268327166139816f575add6b2958943efd5a020.tar.bz2 | |
environment: Fix detection of xild with icc
Diffstat (limited to 'mesonbuild/environment.py')
| -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 4f14535..16c774d 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1003,11 +1003,11 @@ class Environment: ccache + compiler, version, for_machine, is_cross, info, exe_wrap, linker=linker) if '(ICC)' in out: + cls = IntelCCompiler if lang == 'c' else IntelCPPCompiler if self.machines[for_machine].is_darwin(): l = XildAppleDynamicLinker(compiler, for_machine, 'xild', cls.LINKER_PREFIX, version=version) else: l = XildLinuxDynamicLinker(compiler, for_machine, 'xild', cls.LINKER_PREFIX, version=version) - cls = IntelCCompiler if lang == 'c' else IntelCPPCompiler return cls( ccache + compiler, version, for_machine, is_cross, info, exe_wrap, full_version=full_version, linker=l) |