diff options
Diffstat (limited to 'llvm/tools/msbuild/LLVM.Cpp.Common.props')
| -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 9a50dcd8a45..3420b77cfff 100644 --- a/llvm/tools/msbuild/LLVM.Cpp.Common.props +++ b/llvm/tools/msbuild/LLVM.Cpp.Common.props @@ -41,6 +41,9 @@ <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM)</LLVMInstallDir>
<LLVMInstallDir Condition="'$(LLVMInstallDir)' != ''">$(LLVMInstallDir)\</LLVMInstallDir>
<ClangClExecutable>$(LLVMInstallDir)bin\clang-cl.exe</ClangClExecutable>
+ <LldLinkExecutable>$(LLVMInstallDir)bin\lld-link.exe</LldLinkExecutable>
+ <UseClangCl>true</UseClangCl>
+ <UseLldLink>true</UseLldLink>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props" Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props')"/>
@@ -69,8 +72,6 @@ not pass the option). Only if the user explicitly overrode this setting in a project to use
/RTCu would we see the warning. -->
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
-
- <AdditionalOptions>-m$(PlatformArchitecture) %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
</Project>
|
