diff options
author | lateralusX <lateralusx.github@gmail.com> | 2019-01-08 16:06:14 +0300 |
---|---|---|
committer | lateralusX <lateralusx.github@gmail.com> | 2019-01-08 16:06:14 +0300 |
commit | 46a1c80a41c6d5be7204fbd9c38875dd393b456f (patch) | |
tree | 61d4ce8b07e2943d37b2a13992330b5d1dddfbeb /msvc/build-external-llvm.vcxproj | |
parent | b9e209fc9376f823707b674ea0a734a54b7a7fb4 (diff) |
Fix warnings and build errors when bumping Mono on alternative Windows platforms.
Several of the name changes fixes MSVC warnings where local variables
hides global variables using the same name.
Number of adjustments not building on platforms not defining HAVE_CLASSIC_WINAPI_SUPPORT.
Fix a couple of build projects not setting dependencies on build-init.vcxproj.
This could cause races in build order if projects depend on build initialization.
Added support to force external builds to use msbuild even if ninja is present.
Diffstat (limited to 'msvc/build-external-llvm.vcxproj')
-rw-r--r-- | msvc/build-external-llvm.vcxproj | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/msvc/build-external-llvm.vcxproj b/msvc/build-external-llvm.vcxproj index e74168261aa..92ccd49fe19 100644 --- a/msvc/build-external-llvm.vcxproj +++ b/msvc/build-external-llvm.vcxproj @@ -18,6 +18,11 @@ <Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="build-init.vcxproj">
+ <Project>{92ae7622-5f58-4234-9a26-9ec71876b3f4}</Project>
+ </ProjectReference>
+ </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{C3D4C623-55F8-4653-980D-61AA629B4E1D}</ProjectGuid>
<RootNamespace>buildexternalllvm</RootNamespace>
@@ -153,20 +158,27 @@ <_LLVMCFlags>$(_LLVMCFlags.Trim())</_LLVMCFlags>
<_LLVMCFlags Condition="'$(_LLVMCFlags)' != ''">-D$(_LLVMCFlags.Replace(" "," -D"))</_LLVMCFlags>
<_LLVMEnableAsserts>-DLLVM_ENABLE_ASSERTIONS=Off</_LLVMEnableAsserts>
- <_LLVMEnableAsserts Condition="'$(MONO_ENABLE_LLVM_ASSERTS)' == 'true'" >-DLLVM_ENABLE_ASSERTIONS=On</_LLVMEnableAsserts>
+ <_LLVMEnableAsserts Condition="'$(MONO_ENABLE_LLVM_ASSERTS)' == 'true'">-DLLVM_ENABLE_ASSERTIONS=On</_LLVMEnableAsserts>
<_LLVMAdditionalCMakeArgs>$(_LLVMEnableAsserts)</_LLVMAdditionalCMakeArgs>
<_LLVMBuildCommand>build-external-llvm.bat "$(_LLVMSourceDir)" "$(_LLVMBuildDir)" "$(_LLVMInstallDir)" "$(_MonoOutputDir)" "$(_LLVMCFlags)" "$(_LLVMAdditionalCMakeArgs)" "$(Platform)" "$(Configuration)"</_LLVMBuildCommand>
</PropertyGroup>
<Target Name="_AfterBuildExternalLLVM" Condition="'$(MONO_ENABLE_LLVM)' == 'true' and '$(_MonoEnableInternalLLVM)' == 'true'">
- <Exec Command="$(_LLVMBuildCommand) "Build" "$(MSBuildBinPath)\"">
+ <Exec Command="$(_LLVMBuildCommand) "Build" "$(MSBuildBinPath)\" "$(_MonoExternalBuildForceMSBuild)"">
<Output TaskParameter="ExitCode" PropertyName="_BuildExternalLLVMExitCode" />
</Exec>
</Target>
<Target Name="_AfterCleanExternalLLVM" Condition="'$(MONO_ENABLE_LLVM)' == 'true' and '$(_MonoEnableInternalLLVM)' == 'true'">
- <Exec Command="$(_LLVMBuildCommand) "Clean" "$(MSBuildBinPath)\"">
+ <Exec Command="$(_LLVMBuildCommand) "Clean" "$(MSBuildBinPath)\" "$(_MonoExternalBuildForceMSBuild)"">
<Output TaskParameter="ExitCode" PropertyName="_CleanExternalLLVMExitCode" />
</Exec>
</Target>
<Target Name="AfterBuild" DependsOnTargets="_ConfigureExternalMonoLLVMBuildEnvironment;_AfterBuildExternalLLVM" />
<Target Name="AfterClean" DependsOnTargets="_ConfigureExternalMonoLLVMBuildEnvironment;_AfterCleanExternalLLVM" />
+
+ <Target Name="_GetLLVMConfig" DependsOnTargets="_ConfigureExternalMonoLLVMBuildEnvironment" Returns="@(_GetLLVMConfigOutputItems)">
+ <ItemGroup>
+ <_GetLLVMConfigOutputItems Include="$(_MonoLLVMConfig)" />
+ </ItemGroup>
+ </Target>
+
</Project>
\ No newline at end of file |