Merge pull request #11 from jsturtevant/use-wask-sdk

Switch to using the wasi-sdk clang to build cabi_realloc files
bytecodealliance · Jun 6, 2024 · a66f726 · a66f726
2 parents bda53bd + 00ee6ea
commit a66f726
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/WitBindgen/build/WitBindgen.targets b/src/WitBindgen/build/WitBindgen.targets
@@ -22,8 +22,10 @@
     -->
     <Target Name="PrepareWasmSdks" BeforeTargets="CheckWasmSdks" DependsOnTargets="ObtainWasiSdk; ObtainEmscripten">
         <PropertyGroup>
+            <ClangExeName>clang</ClangExeName>
+            <ClangExeName Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(ClangExeName).exe</ClangExeName>
             <EmSdk>$(EmscriptenRoot)</EmSdk>
-            <Wasicompiler>$(EmscriptenRoot)\upstream\emscripten\emcc.bat</Wasicompiler>
+            <Wasicompiler>$(WasiSdkRoot)\bin\$(ClangExeName)</Wasicompiler>
             <WASI_SDK_PATH>$(WasiSdkRoot)</WASI_SDK_PATH>
         </PropertyGroup>
     </Target>