Skip to content

Commit c2ecc1c

Browse files
Fix linking conditions
1 parent a2c4d36 commit c2ecc1c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/mono/browser/build/BrowserWasmApp.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,8 @@
460460
<ItemGroup>
461461
<_MonoRuntimeComponentDontLink Include="libmono-component-diagnostics_tracing-static.a" Condition="'$(EnableDiagnostics)' != 'true'" />
462462
<_MonoRuntimeComponentDontLink Include="libmono-component-diagnostics_tracing-stub-static.lib" Condition="'$(EnableDiagnostics)' == 'true'" />
463+
<_MonoRuntimeComponentDontLink Include="libSystem.Native.TimeZoneData.Disabled.a" Condition="'$(InvariantTimezone)' != 'true'" />
464+
<_MonoRuntimeComponentDontLink Include="libSystem.Native.TimeZoneData.a" Condition="'$(InvariantTimezone)' == 'true'" />
463465
</ItemGroup>
464466

465467
<ItemGroup>
@@ -482,8 +484,6 @@
482484
<_WasmNativeFileForLinking Condition="'$(_WasmSIMDLib)' != ''" Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(_WasmSIMDLib)" />
483485
<_WasmNativeFileForLinking Remove="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(_WasmEHLibToExclude)" />
484486
<_WasmNativeFileForLinking Remove="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(_WasmSIMDLibToExclude)" />
485-
<_WasmNativeFileForLinking Condition="'$(InvariantTimezone)' == 'true'" Remove="libSystem.Native.TimeZoneData.a" />
486-
<_WasmNativeFileForLinking Condition="'$(InvariantTimezone)' != 'true'" Remove="libSystem.Native.TimeZoneData.Disabled.a" />
487487

488488
<_WasmExtraJSFile Include="@(Content)" Condition="'%(Content.Extension)' == '.js'" />
489489

src/mono/wasi/build/WasiApp.targets

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,8 @@
366366
<ItemGroup>
367367
<_MonoRuntimeComponentDontLink Include="libmono-component-diagnostics_tracing-static.a" Condition="'$(EnableDiagnostics)' != 'true'" />
368368
<_MonoRuntimeComponentDontLink Include="libmono-component-diagnostics_tracing-stub-static.lib" Condition="'$(EnableDiagnostics)' == 'true'" />
369+
<_MonoRuntimeComponentDontLink Include="libSystem.Native.TimeZoneData.Disabled.a" Condition="'$(InvariantTimezone)' != 'true'" />
370+
<_MonoRuntimeComponentDontLink Include="libSystem.Native.TimeZoneData.a" Condition="'$(InvariantTimezone)' == 'true'" />
369371
</ItemGroup>
370372

371373
<ItemGroup>
@@ -390,10 +392,7 @@
390392
<_WasmNativeFileForLinking Condition="'$(_WasmSIMDLib)' != ''" Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(_WasmSIMDLib)" />
391393
<_WasmNativeFileForLinking Remove="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(_WasmEHLibToExclude)" />
392394
<_WasmNativeFileForLinking Remove="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(_WasmSIMDLibToExclude)" />
393-
<_WasmNativeFileForLinking Condition="'$(InvariantTimezone)' == 'true'" Remove="libSystem.Native.TimeZoneData.a" />
394-
<_WasmNativeFileForLinking Condition="'$(InvariantTimezone)' != 'true'" Remove="libSystem.Native.TimeZoneData.Disabled.a" />
395395
<_WasmNativeFileForLinking Include="-lstdc++" />
396-
397396
<_WasmNativeFileForLinking Include="@(NativeFileReference)" />
398397
</ItemGroup>
399398

0 commit comments

Comments
 (0)