Skip to content
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

[mono] Use libclang from dotnet/llvm-project for offsets-tool.py #109188

Merged
merged 1 commit into from
Oct 24, 2024

Conversation

akoeplinger
Copy link
Member

Removes the need for a system-installed libclang.

Removes the need for a system-installed libclang.
Copy link
Member

@steveisok steveisok left a comment

Choose a reason for hiding this comment

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

Makes sense to me!

Comment on lines +931 to +934
<_LibclangSuffix Condition="'$(HostOS)' == 'Windows'">.dll</_LibclangSuffix>
<_LibclangSuffix Condition="'$(HostOS)' == 'OSX'">.dylib</_LibclangSuffix>
<_LibclangSuffix Condition="'$(_LibclangSuffix)' == ''">.so</_LibclangSuffix>
<_LibclangPath>$(_LibclangPackageReferencePath)\tools\libclang$(_LibclangSuffix)</_LibclangPath>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<_LibclangSuffix Condition="'$(HostOS)' == 'Windows'">.dll</_LibclangSuffix>
<_LibclangSuffix Condition="'$(HostOS)' == 'OSX'">.dylib</_LibclangSuffix>
<_LibclangSuffix Condition="'$(_LibclangSuffix)' == ''">.so</_LibclangSuffix>
<_LibclangPath>$(_LibclangPackageReferencePath)\tools\libclang$(_LibclangSuffix)</_LibclangPath>
<_LibclangPath>$(_LibclangPackageReferencePath)\tools\libclang$(LibSuffix)</_LibclangPath>

(eng/native/naming.props is already included in all contexts)

Copy link
Member Author

@akoeplinger akoeplinger Oct 24, 2024

Choose a reason for hiding this comment

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

that doesn't work since we need the extension for the host OS where the offsets-generator runs during the build. naming.props is based off of PackageRID i.e. TargetOS

Copy link
Member

@am11 am11 Oct 24, 2024

Choose a reason for hiding this comment

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

ah, right, maybe we can create another set there completely based on host if this kind of thing has more than one usage (e.g. CG2 may also be doing similar shenanigans somewhere 😅).

@akoeplinger
Copy link
Member Author

/ba-g failures are unrelated to the offset-tool changes

@akoeplinger akoeplinger merged commit 381ea07 into dotnet:main Oct 24, 2024
149 of 157 checks passed
@akoeplinger akoeplinger deleted the replace-libclang branch October 24, 2024 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants