mirror of https://gitlab.com/ita1024/waf.git
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:
commit
ccfe1fc19c
|
@ -37,16 +37,20 @@ def get_llvm_paths(self):
|
||||||
try:
|
try:
|
||||||
llvm_key = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE,'SOFTWARE\\Wow6432Node\\LLVM\\LLVM')
|
llvm_key = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE,'SOFTWARE\\Wow6432Node\\LLVM\\LLVM')
|
||||||
except OSError:
|
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_key:
|
||||||
if llvm_dir:
|
llvm_dir, _ = Utils.winreg.QueryValueEx(llvm_key, '')
|
||||||
llvm_path.append(os.path.join(llvm_dir, 'bin'))
|
if llvm_dir:
|
||||||
|
llvm_path.append(os.path.join(llvm_dir, 'bin'))
|
||||||
|
|
||||||
tmp = self.environ.get('LLVM_PATH') or self.env.LLVM_PATH
|
tmp = self.environ.get('LLVM_PATH') or self.env.LLVM_PATH
|
||||||
if tmp:
|
if tmp:
|
||||||
llvm_path.append(tmp)
|
llvm_path.append(tmp)
|
||||||
llvm_path.append(self.env.PATH)
|
llvm_path += self.env.PATH
|
||||||
return llvm_path
|
return llvm_path
|
||||||
|
|
||||||
@conf
|
@conf
|
||||||
|
|
Loading…
Reference in New Issue