diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-08-07 09:02:06 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-08-07 09:02:06 +0000 |
| commit | 68e07d4d6fab53a99c9f11466ad562e3ed7486b5 (patch) | |
| tree | 3f4a8efa2f48f0b3ae6196ba546f313ab11766a8 | |
| parent | c6ddb461629f4f71186bcf3f019bb66e4d6413fa (diff) | |
| download | bcm5719-llvm-68e07d4d6fab53a99c9f11466ad562e3ed7486b5.tar.gz bcm5719-llvm-68e07d4d6fab53a99c9f11466ad562e3ed7486b5.zip | |
vs integration: fix default path to clang-cl
Differential Revision: https://reviews.llvm.org/D50335
llvm-svn: 339117
| -rw-r--r-- | llvm/tools/msbuild/LLVM.Cpp.Common.props | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/tools/msbuild/LLVM.Cpp.Common.props b/llvm/tools/msbuild/LLVM.Cpp.Common.props index ffc1270a85c..8cd81577a1b 100644 --- a/llvm/tools/msbuild/LLVM.Cpp.Common.props +++ b/llvm/tools/msbuild/LLVM.Cpp.Common.props @@ -37,8 +37,9 @@ <!-- Find an installed LLVM and set up our paths. --> <PropertyGroup> - <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM@LLVM)</LLVMInstallDir> - <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM@LLVM)</LLVMInstallDir> + <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM)</LLVMInstallDir> + <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM)</LLVMInstallDir> + <LLVMInstallDir Condition="'$(LLVMInstallDir)' != ''">$(LLVMInstallDir)\</LLVMInstallDir> <ClangClExecutable>$(LLVMInstallDir)bin\clang-cl.exe</ClangClExecutable> </PropertyGroup> |
