Change default AOT LLVM path from $PATH to /usr/lib/mono/llvm/bin

(cherry picked from commit ed559d76e67e49219d86719df394925a21a50e88)
This commit is contained in:
Jo Shields 2018-04-17 10:37:02 -04:00
parent f4b2d01648
commit 203ff2e9e8
No known key found for this signature in database
GPG Key ID: C90F9CB90E1FAD0C
2 changed files with 15 additions and 0 deletions

View File

@ -0,0 +1,13 @@
diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index d831bfe8cf5..e419cbdb53b 100644
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -12465,7 +12465,7 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options,
acfg->aot_opts.nimt_trampolines = 512;
acfg->aot_opts.nrgctx_fetch_trampolines = 128;
acfg->aot_opts.ngsharedvt_arg_trampolines = 512;
- 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;

View File

@ -38,6 +38,7 @@ License: LGPL-2.1 and MIT and MS-PL
Group: Development/Languages/Mono
Url: http://www.mono-project.com
Source0: http://download.mono-project.com/sources/mono/mono-%{version}.tar.bz2
Patch0: llvm_llc_opt_default_path.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@ -136,6 +137,7 @@ technologies that have been submitted to the ECMA for standardization.
%prep
%setup -q -n mono-%{version}
%patch0 -p1
%build
%{?scl:scl enable %{scl} - << \EOF}