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

Checking for program 'clang-cl' - is not executable error fix

See merge request ita1024/waf!2296
This commit is contained in:
Andrew Brodko 2020-07-08 20:13:24 +00:00
commit 3a7209a724
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") if isinstance(llvm_dir, unicode) else llvm_dir, 'bin'))
tmp = self.environ.get('LLVM_PATH') or self.env.LLVM_PATH
if tmp: