FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add the script path to OneApi Fortran compilers

This commit is contained in:
Waf Project 2024-03-18 23:34:44 +01:00
parent cd0c77725e
commit 7a15d4c74c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
waflib/Tools/ifort.py
View File

@ -137,9 +137,13 @@ def gather_ifort_versions(conf, versions):
except OSError: except OSError:
pass pass
else: else:
batch_file=os.path.join(path,'bin','ifortvars.bat') batch_file = os.path.join(path, 'bin', 'ifortvars.bat')
if os.path.isfile(batch_file): if os.path.isfile(batch_file):
targets[target] = target_compiler(conf, 'intel', arch, version, target, batch_file) targets[target] = target_compiler(conf, 'intel', arch, version, target, batch_file)
else:
batch_file = os.path.join(path, 'env', 'vars.bat')
if os.path.isfile(batch_file):
targets[target] = target_compiler(conf, 'oneapi', arch, version, target, batch_file)
for target,arch in all_ifort_platforms: for target,arch in all_ifort_platforms:
try: try:
@ -308,7 +312,11 @@ def get_ifort_versions(self, eval_and_save=True):
return dct return dct
def _get_prog_names(self, compiler): def _get_prog_names(self, compiler):
if compiler=='intel': if compiler == 'oneapi':
compiler_name = 'ifx'
linker_name = 'XILINK'
lib_name = 'XILIB'
elif compiler == 'intel':
compiler_name = 'ifort' compiler_name = 'ifort'
linker_name = 'XILINK' linker_name = 'XILINK'
lib_name = 'XILIB' lib_name = 'XILIB'