From 61ff2ac19ccba4a69910ca9b2686c51e8bbc0986 Mon Sep 17 00:00:00 2001 From: Waf Project Date: Thu, 26 Oct 2023 17:20:51 +0200 Subject: [PATCH] Fix loading both icc and icpc at the same time --- waflib/Tools/icc.py | 4 ++-- waflib/Tools/icpc.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/waflib/Tools/icc.py b/waflib/Tools/icc.py index a5fe2ccf..1b41ffcf 100644 --- a/waflib/Tools/icc.py +++ b/waflib/Tools/icc.py @@ -23,7 +23,7 @@ def find_icc(conf): conf.env.INTEL_CLANG_COMPILER = True conf.env.CC = conf.env.ICXCL - if not conf.env.INTEL_CLANG_COMPILER: + if not conf.env.ICXCL: cc = conf.find_program(['icx', 'icc', 'ICL'], var='CC') conf.get_cc_version(cc, icc=True) @@ -31,7 +31,7 @@ def find_icc(conf): def configure(conf): conf.find_icc() - if conf.env.INTEL_CLANG_COMPILER and Utils.is_win32: + if conf.env.ICXCL and Utils.is_win32: conf.find_msvc() conf.find_program('MT', var='MT') conf.env.MTFLAGS = ['/nologo'] diff --git a/waflib/Tools/icpc.py b/waflib/Tools/icpc.py index fbd8b7a3..2d3a4737 100644 --- a/waflib/Tools/icpc.py +++ b/waflib/Tools/icpc.py @@ -17,12 +17,12 @@ def find_icpc(conf): Finds the program icpc, and execute it to ensure it really is icpc """ if Utils.is_win32: - conf.find_program(['icx-cl'], var='ICXCL', mandatory=False) - if conf.env.ICXCL: + conf.find_program(['icx-cl'], var='ICPXCL', mandatory=False) + if conf.env.ICPXCL: conf.env.INTEL_CLANG_COMPILER = True - conf.env.CXX = conf.env.ICXCL + conf.env.CXX = conf.env.ICPXCL - if not conf.env.INTEL_CLANG_COMPILER: + if not conf.env.ICPXCL: cc = conf.find_program(['icpx', 'icpc', 'ICL'], var='CXX') conf.get_cc_version(cc, icc=True) @@ -30,7 +30,7 @@ def find_icpc(conf): def configure(conf): conf.find_icpc() - if conf.env.INTEL_CLANG_COMPILER and Utils.is_win32: + if conf.env.ICPXCL and Utils.is_win32: conf.find_msvc() conf.find_program('MT', var='MT') conf.env.MTFLAGS = ['/nologo']