Imported Upstream version 5.10.0.107

Former-commit-id: b1b451a5c10f756428dd56301de98fae2be5461a
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-02-14 19:52:27 +00:00
parent 5e8fcc7e50
commit 05e67c9e5f
36 changed files with 73 additions and 49 deletions

View File

@ -66,18 +66,8 @@ class MakeBundle {
static bool custom_mode = true;
static string embedded_options = null;
static string runtime_bin = null;
static string runtime = null;
static string runtime {
get {
if (runtime_bin == null && IsUnix)
runtime_bin = Process.GetCurrentProcess().MainModule.FileName;
return runtime_bin;
}
set { runtime_bin = value; }
}
static bool aot_compile = false;
static string aot_args = "static";
static DirectoryInfo aot_temp_dir = null;
@ -737,8 +727,12 @@ class MakeBundle {
static bool GeneratePackage (List<string> files)
{
if (runtime == null){
Error ("You must specify at least one runtime with --runtime or --cross");
Environment.Exit (1);
if (IsUnix)
runtime = Process.GetCurrentProcess().MainModule.FileName;
else {
Error ("You must specify at least one runtime with --runtime or --cross");
Environment.Exit (1);
}
}
if (!File.Exists (runtime)){
Error ($"The specified runtime at {runtime} does not exist");