Skip to content

Commit 8395429

Browse files
Add support for WASI SDK 26.0/27.0 (#3162)
1 parent 8a2d22d commit 8395429

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Wasm.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ The .NET Foundation licenses this file to you under the MIT license.
3838

3939
<!-- Verify the SDK version. We only issue a warning since it's **possible** a newer SDK might work. -->
4040
<PropertyGroup>
41-
<_ExpectedWasiSdkVersion>25.0</_ExpectedWasiSdkVersion>
41+
<_ExpectedWasiSdkVersions>25.0|26.0|27.0</_ExpectedWasiSdkVersions>
4242
<_ActualWasiSdkVersion>?</_ActualWasiSdkVersion>
4343
<_ActualWasiSdkVersion Condition="Exists('$(WASI_SDK_PATH)/VERSION')">$([System.IO.File]::ReadAllText('$(WASI_SDK_PATH)/VERSION').Split()[0])</_ActualWasiSdkVersion>
4444
</PropertyGroup>
4545

46-
<Warning Text="Wasi SDK version $(_ActualWasiSdkVersion) is being used. This differs from the expected $(_ExpectedWasiSdkVersion) and might result in build or runtime failures."
47-
Condition="'$(_ExpectedWasiSdkVersion)' != '$(_ActualWasiSdkVersion)'" />
46+
<Warning Text="Wasi SDK version $(_ActualWasiSdkVersion) is being used. This differs from the expected $(_ExpectedWasiSdkVersions) and might result in build or runtime failures."
47+
Condition="!$(_ExpectedWasiSdkVersions.Contains($(_ActualWasiSdkVersion)))" />
4848
</Target>
4949

5050
</Project>

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,8 @@ The .NET Foundation licenses this file to you under the MIT license.
601601

602602
<ItemGroup Condition="'$(_targetOS)' == 'wasi'" >
603603
<CustomLinkerArg Include="@(_CustomLinkerArgExport->'-Wl,--export=%(Identity)')" />
604-
<CustomLinkerArg Include="-lstdc++;-lwasi-emulated-process-clocks;-lwasi-emulated-signal;-lwasi-emulated-mman;-lwasi-emulated-getpid;-lwasi-emulated-pthread" />
604+
<CustomLinkerArg Include="-lstdc++;-lwasi-emulated-process-clocks;-lwasi-emulated-signal;-lwasi-emulated-mman;-lwasi-emulated-getpid" />
605+
<CustomLinkerArg Include="-lwasi-emulated-pthread" Condition="'$(_ActualWasiSdkVersion)' == '25.0'" />
605606
<CustomLinkerArg Include="-Wl,--max-memory=2147483648" />
606607
<CustomLinkerArg Include="-Wl,--global-base=$(IlcWasmGlobalBase)" />
607608
<CustomLinkerArg Include="-Wl,-z,stack-size=$(IlcWasmStackSize)" />

0 commit comments

Comments
 (0)