From 7462abe8326b9a5a83f481ea109ddc3a7b2e32f2 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Tue, 31 Mar 2020 23:33:24 -0700 Subject: [PATCH] Fix build break in coreclr where -os is not supported in Windows --- src/coreclr/crossgen-corelib.proj | 2 +- src/coreclr/runtime.proj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj index 6551f5db6ba267..1027019a412c49 100644 --- a/src/coreclr/crossgen-corelib.proj +++ b/src/coreclr/crossgen-corelib.proj @@ -6,7 +6,7 @@ <_CoreClrBuildArg Condition="'$(TargetArchitecture)' != ''" Include="-$(TargetArchitecture)" /> <_CoreClrBuildArg Include="-$(Configuration.ToLower())" /> - <_CoreClrBuildArg Include="-os $(TargetOS)" /> + <_CoreClrBuildArg Condition="!$([MSBuild]::IsOsPlatform(Windows))" Include="-os $(TargetOS)" /> diff --git a/src/coreclr/runtime.proj b/src/coreclr/runtime.proj index 344d76b2f28fef..02c4c5e205205d 100644 --- a/src/coreclr/runtime.proj +++ b/src/coreclr/runtime.proj @@ -10,7 +10,7 @@ <_CoreClrBuildArg Include="$(Compiler)" /> <_CoreClrBuildArg Condition="'$(ContinuousIntegrationBuild)' == 'true'" Include="-ci" /> <_CoreClrBuildArg Condition="'$(CrossBuild)' == 'true'" Include="-cross" /> - <_CoreClrBuildArg Include="-os $(TargetOS)" /> + <_CoreClrBuildArg Condition="!$([MSBuild]::IsOsPlatform(Windows))" Include="-os $(TargetOS)" /> <_CoreClrBuildArg Condition="$([MSBuild]::IsOsPlatform(Windows)) and ('$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'x64') and '$(Configuration)' == 'Release'" Include="-enforcepgo" /> <_CoreClrBuildArg Condition="$([MSBuild]::IsOsPlatform(Windows)) and '$(CrossDac)' != ''" Include="-$(CrossDac)dac" />