mirror of
https://gitlab.com/ita1024/waf.git
synced 2024-11-22 09:57:15 +01:00
Detect new intel compilers (icx, icpx, ifx)
This commit is contained in:
parent
f0b2fb9816
commit
50644394f6
@ -7,7 +7,6 @@
|
||||
Detects the Intel C compiler
|
||||
"""
|
||||
|
||||
import sys
|
||||
from waflib.Tools import ccroot, ar, gcc
|
||||
from waflib.Configure import conf
|
||||
|
||||
@ -16,7 +15,7 @@ def find_icc(conf):
|
||||
"""
|
||||
Finds the program icc and execute it to ensure it really is icc
|
||||
"""
|
||||
cc = conf.find_program(['icc', 'ICL'], var='CC')
|
||||
cc = conf.find_program(['icx', 'icc', 'ICL'], var='CC')
|
||||
conf.get_cc_version(cc, icc=True)
|
||||
conf.env.CC_NAME = 'icc'
|
||||
|
||||
|
@ -6,7 +6,6 @@
|
||||
Detects the Intel C++ compiler
|
||||
"""
|
||||
|
||||
import sys
|
||||
from waflib.Tools import ccroot, ar, gxx
|
||||
from waflib.Configure import conf
|
||||
|
||||
@ -15,7 +14,7 @@ def find_icpc(conf):
|
||||
"""
|
||||
Finds the program icpc, and execute it to ensure it really is icpc
|
||||
"""
|
||||
cxx = conf.find_program('icpc', var='CXX')
|
||||
cxx = conf.find_program(['icpx', 'icpc'], var='CXX')
|
||||
conf.get_cc_version(cxx, icc=True)
|
||||
conf.env.CXX_NAME = 'icc'
|
||||
|
||||
|
@ -11,7 +11,7 @@ from waflib.TaskGen import after_method, feature
|
||||
|
||||
@conf
|
||||
def find_ifort(conf):
|
||||
fc = conf.find_program('ifort', var='FC')
|
||||
fc = conf.find_program(['ifx', 'ifort'], var='FC')
|
||||
conf.get_ifort_version(fc)
|
||||
conf.env.FC_NAME = 'IFORT'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user