MSBuild integration: get the LibraryPath right (PR18707)

[oota-llvm.git] / tools / msbuild / Microsoft.Cpp.Win32.llvm.props.in

diff --git a/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in b/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in
index a6ef4eafc5831809f3095431fd6667fc0674e0a4..a775c31c7670415bf2ca482e6ce032257ebedd84 100644 (file)
--- a/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in
+++ b/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in
@@ -6,13 +6,13 @@
     <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\@REG_KEY@)</LLVMInstallDir>\r
     <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\@REG_KEY@)</LLVMInstallDir>\r
     <ExecutablePath>$(LLVMInstallDir)\msbuild-bin;$(ExecutablePath)</ExecutablePath>\r
-    <LibraryPath>$(LLVMInstallDir)\lib\clang\3.4\lib\windows;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath>$(LLVMInstallDir)\lib\clang\@LIB_PATH_VERSION@\lib\windows;$(LibraryPath)</LibraryPath>\r
   </PropertyGroup>\r
 \r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
       <!-- Set the value of _MSC_VER to claim for compatibility -->\r
-      <AdditionalOptions>-fmsc-version=@MSC_VERSION@ %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalOptions>-@mflag@ -fmsc-version=@MSC_VERSION@ %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
 </Project>\r