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

Merge branch 'FixClangCL' into 'waf-2.1' 

Fix configuration fail on Windows with clang-cl module when not using the llvm.org release

See merge request ita1024/waf!2298
This commit is contained in:
ita1024 2020-08-14 06:36:40 +00:00
parent 35b60bed61 1f92d020e7
commit ccfe1fc19c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
waflib/extras/clang_cl.py
View File

@ -37,16 +37,20 @@ def get_llvm_paths(self):
try:
llvm_key = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE,'SOFTWARE\\Wow6432Node\\LLVM\\LLVM')
except OSError:
llvm_key = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\LLVM\\LLVM')
try:
llvm_key = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\LLVM\\LLVM')
except OSError:
llvm_key = None
llvm_dir, _ = Utils.winreg.QueryValueEx(llvm_key, '')
if llvm_dir:
llvm_path.append(os.path.join(llvm_dir, 'bin'))
if llvm_key:
llvm_dir, _ = Utils.winreg.QueryValueEx(llvm_key, '')
if llvm_dir:
llvm_path.append(os.path.join(llvm_dir, 'bin'))
tmp = self.environ.get('LLVM_PATH') or self.env.LLVM_PATH
if tmp:
llvm_path.append(tmp)
llvm_path.append(self.env.PATH)
llvm_path += self.env.PATH
return llvm_path
@conf