Skip to content

[release/7.0-rc1][mini] double quote linker path in defined(LD_NAME) case #74453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 2 commits into from
Aug 24, 2022
Merged

[release/7.0-rc1][mini] double quote linker path in defined(LD_NAME) case #74453

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bea49c5
[mini] double quote linker path in defined(LD_NAME) case
lambdageek Aug 23, 2022
09bba90
also add an "llvm_only" branch to the defined(LD_NAME) case
lambdageek Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
also add an "llvm_only" branch to the defined(LD_NAME) case
  • Loading branch information
@lambdageek
lambdageek committed Aug 23, 2022
commit 09bba90ab312dbd2ebcf1f7f1f4bc4be76cbce17
7 changes: 6 additions & 1 deletion src/mono/mono/mini/aot-compiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12737,7 +12737,12 @@ compile_asm (MonoAotCompile *acfg)
if (ld_binary_name == NULL) {
ld_binary_name = LD_NAME;
}
g_string_append_printf (str, "\"%s%s\" %s", tool_prefix, ld_binary_name, LD_OPTIONS);
if (acfg->aot_opts.tool_prefix)
g_string_append_printf (str, "\"%s%s\" %s", tool_prefix, ld_binary_name, LD_OPTIONS);
else if (acfg->aot_opts.llvm_only)
g_string_append_printf (str, "%s", acfg->aot_opts.clangxx);
else
g_string_append_printf (str, "\"%s%s\" %s", tool_prefix, ld_binary_name, LD_OPTIONS);
#else
if (ld_binary_name == NULL) {
ld_binary_name = "ld";
Expand Down