From b268327166139816f575add6b2958943efd5a020 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 11 Oct 2019 10:12:49 -0700 Subject: environment: Fix detection of xild with icc --- mesonbuild/environment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/environment.py') 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) -- cgit v1.1