Merge branch 'patch-1' into 'waf-2.1'

Fixed path error ('u' prefix in LLVM path) caused by winreg value encoding:

See merge request ita1024/waf!2295
This commit is contained in:
Andrew Brodko 2020-07-08 17:18:25 +00:00
commit 165800f4d1
1 changed files with 1 additions and 1 deletions

View File

@ -41,7 +41,7 @@ def get_llvm_paths(self):
llvm_dir, _ = Utils.winreg.QueryValueEx(llvm_key, '')
if llvm_dir:
llvm_path.append(os.path.join(llvm_dir, 'bin'))
llvm_path.append(os.path.join(llvm_dir.encode("utf-8"), 'bin'))
tmp = self.environ.get('LLVM_PATH') or self.env.LLVM_PATH
if tmp: