diff options
| author | Bernhard Urban <bernhard.urban@xamarin.com> | 2016-12-15 11:41:26 +0300 |
|---|---|---|
| committer | Bernhard Urban <bernhard.urban@xamarin.com> | 2016-12-15 15:50:04 +0300 |
| commit | 1e31bd78e69569c9e26a7d5018660ad389112b17 (patch) | |
| tree | 0cd8cfeb857a4cd5c3b624ac940b19792a405b57 | |
| parent | 8a1a7d51befd123793f9623b64241b1346524a85 (diff) | |
[aot] fix linker invocation for llvm mode on linux
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
| -rw-r--r-- | mono/mini/aot-compiler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c index a1c359f96a9..14bc01ca5a1 100644 --- a/mono/mini/aot-compiler.c +++ b/mono/mini/aot-compiler.c @@ -9974,7 +9974,7 @@ compile_asm (MonoAotCompile *acfg) wrap_path (tmp_outfile_name), wrap_path (llvm_ofile), wrap_path (g_strdup_printf ("%s.o", 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); |