diff options
| author | Christian Scheuer <info@creatix.dk> | 2018-02-04 03:47:18 +0300 |
|---|---|---|
| committer | Morgan Brown <morganbr@users.noreply.github.com> | 2018-02-04 03:47:18 +0300 |
| commit | f19daaae780f2b0b2675792a8b0ef071dc1e58ff (patch) | |
| tree | 638ec60b9f3f2c538b9288a1f8ab32f8dc8f0048 /src/BuildIntegration/Microsoft.NETCore.Native.Unix.props | |
| parent | 2aaccdfc08dc2217bbc1777d4c98dda2a4867fb7 (diff) | |
Add support for building wasm on OSX and Ubuntu 16 (#5297)
* Enable wasm building on OSX.
Upgrade libLLVM to 4.0.0 and LLVMSharp to 5.0.0
LLVM upgrade: Fix 'Use still stuck around after Def is destroyed' of the deleted basic blocks
Add wasm support in runtest.sh
Remove HelloWasm.csproj reference to .ilproj on non-windows OS because of dependency on ilasm
Fix LinkNative target to execute correct commands for Unix wasm builds.
Added support for building on Ubuntu 16.04.3
Update documentation on how to build WebAssembly.
Diffstat (limited to 'src/BuildIntegration/Microsoft.NETCore.Native.Unix.props')
| -rw-r--r-- | src/BuildIntegration/Microsoft.NETCore.Native.Unix.props | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.Unix.props b/src/BuildIntegration/Microsoft.NETCore.Native.Unix.props index 03be5996b..441f4754c 100644 --- a/src/BuildIntegration/Microsoft.NETCore.Native.Unix.props +++ b/src/BuildIntegration/Microsoft.NETCore.Native.Unix.props @@ -33,6 +33,11 @@ See the LICENSE file in the project root for more information. </PropertyGroup> <Target Name="SetupOSSpecificProps" DependsOnTargets="$(IlcDynamicBuildPropertyDependencies)"> + <PropertyGroup> + <NativeLibraryExtension Condition="'$(NativeCodeGen)' != 'wasm'">.a</NativeLibraryExtension> + <NativeLibraryExtension Condition="'$(NativeCodeGen)' == 'wasm'">.bc</NativeLibraryExtension> + </PropertyGroup> + <ItemGroup> <CppCompilerAndLinkerArg Include="-I $(IlcPath)/inc" /> <CppCompilerAndLinkerArg Condition="'$(Configuration)' == 'Debug'" Include="-g -O0" /> @@ -48,19 +53,19 @@ See the LICENSE file in the project root for more information. <NativeLibrary Condition="$(NativeCodeGen) == ''" Include="$(IlcPath)/sdk/libRuntime.a" /> <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)/sdk/libbootstrappercpp.a" /> <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)/sdk/libPortableRuntime.a" /> - <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)/sdk/libbootstrappercpp.a" /> - <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)/sdk/libPortableRuntime.a" /> + <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)/sdk/libbootstrappercpp.bc" /> + <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)/sdk/libPortableRuntime.bc" /> </ItemGroup> <ItemGroup> - <NativeLibrary Include="$(IlcPath)/sdk/libSystem.Private.CoreLib.Native.a" /> - <NativeLibrary Include="$(IlcPath)/framework/System.Native.a" /> - <NativeLibrary Include="$(IlcPath)/framework/System.Globalization.Native.a" /> - <NativeLibrary Include="$(IlcPath)/framework/System.IO.Compression.Native.a" /> - <NativeLibrary Include="$(IlcPath)/framework/System.Net.Http.Native.a" /> - <NativeLibrary Include="$(IlcPath)/framework/System.Net.Security.Native.a" /> - <NativeLibrary Include="$(IlcPath)/framework/System.Security.Cryptography.Native.Apple.a" Condition="'$(TargetOS)' == 'OSX'"/> - <NativeLibrary Include="$(IlcPath)/framework/System.Security.Cryptography.Native.OpenSsl.a" Condition="'$(TargetOS)' != 'OSX'"/> + <NativeLibrary Include="$(IlcPath)/sdk/libSystem.Private.CoreLib.Native$(NativeLibraryExtension)" /> + <NativeLibrary Include="$(IlcPath)/framework/System.Native$(NativeLibraryExtension)" /> + <NativeLibrary Include="$(IlcPath)/framework/System.Globalization.Native$(NativeLibraryExtension)" /> + <NativeLibrary Include="$(IlcPath)/framework/System.IO.Compression.Native$(NativeLibraryExtension)" /> + <NativeLibrary Include="$(IlcPath)/framework/System.Net.Http.Native$(NativeLibraryExtension)" /> + <NativeLibrary Include="$(IlcPath)/framework/System.Net.Security.Native$(NativeLibraryExtension)" /> + <NativeLibrary Include="$(IlcPath)/framework/System.Security.Cryptography.Native.Apple$(NativeLibraryExtension)" Condition="'$(TargetOS)' == 'OSX'"/> + <NativeLibrary Include="$(IlcPath)/framework/System.Security.Cryptography.Native.OpenSsl$(NativeLibraryExtension)" Condition="'$(TargetOS)' != 'OSX'"/> </ItemGroup> <ItemGroup Condition="'$(TargetOS)' == 'OSX'"> |