VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-12 02:30:29 +09:00
Code Activity

[mono] Enable LLVM for iOS by default for AppleAppBuilder (#35338)

Browse source 
* Enable LLVM for iOS by default

* Update Makefile
This commit is contained in:
Egor Bogatov 2020-04-23 20:47:51 +03:00 • committed by GitHub
parent cc49c12003
commit 0fbd88e4bd
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eng/testing/tests.targets
View file

@ -174,6 +174,8 @@
GenerateXcodeProject="True"
BuildAppBundle="True"
Optimized="True"
UseLlvm="$(MonoEnableLLVM)"
LlvmPath="$(RuntimePackDir)\native\cross"
DevTeamProvisioning="$(DevTeamProvisioning)"
OutputDirectory="$(BundleDir)"
AppDir="$(BundleDir)">

3
src/mono/msbuild/AppleAppBuilder/AotCompiler.cs
View file

@ -63,8 +63,7 @@ internal class AotCompiler
// TODO: enable direct-pinvokes (to get rid of -force_loads)
//.Append("direct-pinvoke,")
.Append("full,")
.Append("mattr=+crc,") // enable System.Runtime.Intrinsics.Arm
.Append("mattr=+base,"); // (Crc32 and ArmBase for now)
.Append("mattr=+crc,"); // enable System.Runtime.Intrinsics.Arm (Crc32 and ArmBase for now)
if (useLlvm)
{

2
src/mono/msbuild/AppleAppBuilder/AppleAppBuilder.cs
View file

@ -139,7 +139,7 @@ public class AppleAppBuilderTask : Task
throw new ArgumentException($"ProjectName='{ProjectName}' should not contain spaces");
}
if (UseLlvm && !string.IsNullOrEmpty(LlvmPath))
if (UseLlvm && string.IsNullOrEmpty(LlvmPath))
{
// otherwise we might accidentally use some random llc/opt from PATH (installed with clang)
throw new ArgumentException($"LlvmPath shoun't be empty when UseLlvm is set");

3
src/mono/netcore/sample/iOS/Makefile
View file

@ -1,6 +1,7 @@
MONO_CONFIG=Debug
MONO_ARCH=arm64
DOTNET := ../../../../.././dotnet.sh
USE_LLVM=True
# usage example:
# 'make all MONO_ARCH=x64 MONO_CONFIG=Release' to build the app for simulator
@ -11,7 +12,7 @@ program:
bundle: clean program
$(DOTNET) msbuild /t:BuildAppBundle /p:Configuration=$(MONO_CONFIG) /p:TargetArchitecture=$(MONO_ARCH) \
/p:UseLlvm=$(UseLlvm) /p:LlvmPath=$(LlvmPath)
/p:UseLlvm=$(USE_LLVM)
deploy-sim:
$(DOTNET) msbuild /t:IosDeployToSimulator /p:Configuration=$(MONO_CONFIG) /p:TargetArchitecture=$(MONO_ARCH)

2
src/mono/netcore/sample/iOS/Program.csproj
View file

@ -45,7 +45,7 @@
DevTeamProvisioning="$(DevTeamProvisioning)"
OutputDirectory="$(BundleDir)"
UseLlvm="$(UseLlvm)"
LlvmPath="$(LlvmPath)"
LlvmPath="$(RuntimePackDir)\native\cross"
Optimized="False"
AppDir="$(BundleDir)">
<Output TaskParameter="AppBundlePath" PropertyName="AppBundlePath" />