projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d1d54df
)
[aot] fix linker invocation for llvm mode on linux
author
Bernhard Urban
<bernhard.urban@xamarin.com>
Thu, 15 Dec 2016 06:41:45 +0000
(07:41 +0100)
committer
Bernhard Urban
<bernhard.urban@xamarin.com>
Thu, 15 Dec 2016 12:49:48 +0000
(13:49 +0100)
clang++ should only be used for llvm_only (aka. bitcode) mode.
this is a follow up fix for:
https://github.com/mono/mono/commit/
7d238ddd5edeeb42cec5e07b6d6527d16332f921
and
https://github.com/mono/mono/commit/
fc5305d2af1b6891b05cb82342bf92d4659546e1
fixes https://bugzilla.xamarin.com/show_bug.cgi?id=46375
mono/mini/aot-compiler.c
patch
|
blob
|
history
diff --git
a/mono/mini/aot-compiler.c
b/mono/mini/aot-compiler.c
index e290f83f98b7b5f370fe5ed937e102ca5f4a0489..f5e1c67b47c7466d25aca75b862588bd9cce1950 100644
(file)
--- a/
mono/mini/aot-compiler.c
+++ b/
mono/mini/aot-compiler.c
@@
-10097,7
+10097,7
@@
compile_asm (MonoAotCompile *acfg)
wrap_path (tmp_outfile_name), wrap_path (llvm_ofile),
wrap_path (g_strdup_printf ("%s." AS_OBJECT_FILE_SUFFIX, acfg->tmpfname)), ld_flags);
- if (acfg->
llvm
) {
+ if (acfg->
aot_opts.llvm_only
) {
command = g_strdup_printf ("clang++ %s", args);
} else {
command = g_strdup_printf ("\"%sld\" %s", tool_prefix, args);