mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull in changes from master

Browse Source 
Former-commit-id: a4c8f3836ed3533f1f313cedb4ed7293fbb2d95f
This commit is contained in:
Jo Shields
2019-07-26 15:09:13 -04:00
parent 4463a53782
commit b9dd74e00e
6 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
debian/patches/llvm_llc_opt_default_path.patch vendored
View File

@ -1,13 +1,13 @@
Index: xamarin-pkg-mono/mono/mini/aot-compiler.c
===================================================================
--- xamarin-pkg-mono.orig/mono/mini/aot-compiler.c
+++ xamarin-pkg-mono/mono/mini/aot-compiler.c
@@ -12744,7 +12744,7 @@ mono_compile_assembly (MonoAssembly *ass
acfg->aot_opts.nftnptr_arg_trampolines = 128;
diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index d75d3f934f2..885877869da 100644
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -13279,7 +13279,7 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options,
#endif
acfg->aot_opts.nunbox_arbitrary_trampolines = 256;
- acfg->aot_opts.llvm_path = g_strdup ("");
+ acfg->aot_opts.llvm_path = g_strdup ("/usr/lib/mono/llvm/bin/");
if (!acfg->aot_opts.llvm_path)
- acfg->aot_opts.llvm_path = g_strdup ("");
+ acfg->aot_opts.llvm_path = g_strdup ("/usr/lib/mono/llvm/bin/");
acfg->aot_opts.temp_path = g_strdup ("");
#ifdef MONOTOUCH
acfg->aot_opts.use_trampolines_page = TRUE;