Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to mono/mono/2019-06@6fbdb372 #3443

Merged
merged 5 commits into from
Aug 14, 2019
Merged

Bump to mono/mono/2019-06@6fbdb372 #3443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f1eb14
Bump to mono/mono/2019-06@6fbdb372
jonpryor Aug 5, 2019
22e057a
[build] Cross compilers are now 64bit
pjcollins Aug 9, 2019
f4db8d4
[build] Always install LLVM Runtimes
pjcollins Aug 9, 2019
ddd3669
Bump to mono/mono/2019-06@a7919897
jonpryor Aug 12, 2019
9bb559b
Apply @grendello's feedback
jonpryor Aug 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .external
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627
mono/mono:2019-06@761220d914e28b3ebd67e5642cf8c200110f62ec
mono/mono:2019-06@a7919897e8bc1268547d60ca2283e619a3b3cc45
3 changes: 1 addition & 2 deletions build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ namespace Xamarin.Android.Prepare
partial class LlvmRuntime : Runtime
{
public override string Flavor => "LLVM";
public bool InstallBinaries { get; protected set; }
public bool InstallBinaries { get; protected set; } = true;

public LlvmRuntime (string name, Func<Context, bool> enabledCheck)
: base (name, enabledCheck)
{}

public override void Init (Context context)
{
InstallBinaries = String.Compare (Name, AbiNames.Llvm.Windows64Bit, StringComparison.Ordinal) != 0;
if (Context.IsLlvmWindowsAbi (Name)) {
ExeSuffix = Configurables.Defaults.WindowsExecutableSuffix;
InstallPath = Configurables.Paths.InstallMSBuildDir;
Expand Down
9 changes: 1 addition & 8 deletions build-tools/xaprepare/xaprepare/Application/MonoCrossRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,7 @@ public override void Init (Context context)
Strip = "strip";
StripFlags = "-S";
} else if (Context.IsWindowsCrossAotAbi (Name)) {
string mingwPrefix;

if (Context.Is32BitCrossAbi (Name))
mingwPrefix = Path.Combine (Configurables.Paths.MingwBinDir, Context.Properties.GetRequiredValue (KnownProperties.MingwCommandPrefix32));
else
mingwPrefix = Path.Combine (Configurables.Paths.MingwBinDir, Context.Properties.GetRequiredValue (KnownProperties.MingwCommandPrefix64));

Strip = $"{mingwPrefix}-strip";
Strip = Path.Combine (Configurables.Paths.MingwBinDir, Context.Properties.GetRequiredValue (KnownProperties.MingwCommandPrefix64) + "-strip");
ExeSuffix = Configurables.Defaults.WindowsExecutableSuffix;
} else
throw new InvalidOperationException ($"Unsupported cross compiler abi {Name}");
Expand Down
5 changes: 0 additions & 5 deletions build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,6 @@ partial class Runtimes
enabledCheck: (Context ctx) => IsLlvmRuntimeEnabled (ctx, AbiNames.Llvm.Host64Bit)
),

new LlvmRuntime (
name: AbiNames.Llvm.Windows32Bit,
enabledCheck: (Context ctx) => IsLlvmRuntimeEnabled (ctx, AbiNames.Llvm.Windows32Bit)
),

new LlvmRuntime (
name: AbiNames.Llvm.Windows64Bit,
enabledCheck: (Context) => IsLlvmRuntimeEnabled (ctx, AbiNames.Llvm.Windows64Bit)
Expand Down