Skip to content

[mini] double quote linker path in defined(LD_NAME) case #74451

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.

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
merged 2 commits into from
Aug 24, 2022

Conversation

lambdageek
Copy link
Member

@lambdageek lambdageek commented Aug 23, 2022

In
e71a958
we started setting a default LD_NAME for x86 non-mach targets

Fixes Android x86 builds that specify a tool_prefix with spaces in it

Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1597564

In
dotnet@e71a958
we started setting a default `LD_NAME` for x86 non-mach targets

Fixes Android x86 builds that specify a `tool_prefix` with spaces in it
@lambdageek lambdageek marked this pull request as ready for review August 23, 2022 19:52
@ghost ghost assigned lambdageek Aug 23, 2022
@lambdageek
Copy link
Member Author

This is primarily to fix a regression for net7 XA. for net8 we should make an issue to clean up / simplify all this LD_NAME logic.

@lewing
Copy link
Member

lewing commented Aug 23, 2022

we need this in rc1 correct?

@lambdageek
Copy link
Member Author

we need this in rc1 correct?

yes

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);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the other version we're not adding LD_OPTIONS in the else case

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm trying to preserve the old behavior of the defined(LD_NAME) case - if a tool prefix option isn't set, it uses the ld_binary_name (ie LD_NAME by default) and LD_OPTIONS

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah but I'm more worried about the previous behavior of Android x86, we care more about that than Desktop Linux x86

Copy link
Member Author

@lambdageek lambdageek Aug 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Android sets acfg->aot_opts.tool_prefix, so it's in the "cross compiling" branch, below, not the final "else" branch. So it adds LD_OPTIONS

@lambdageek
Copy link
Member Author

/azp run runtime-extra-platforms

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@akoeplinger akoeplinger merged commit 15d742a into dotnet:main Aug 24, 2022
@ghost ghost locked as resolved and limited conversation to collaborators Sep 23, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants