Skip to content

Conversation

@AaronRobinsonMSFT
Copy link
Member

Copy link
Member

@danmoseley danmoseley left a comment

Choose a reason for hiding this comment

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

if it compiles..

@ghost
Copy link

ghost commented Mar 23, 2022

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

Issue Details

Contributes to #66154

/cc @GrabYourPitchforks @jkotas @am11

Author: AaronRobinsonMSFT
Assignees: AaronRobinsonMSFT
Labels:

area-Infrastructure

Milestone: 7.0.0

@AaronRobinsonMSFT AaronRobinsonMSFT merged commit 0d4b279 into dotnet:main Mar 23, 2022
@AaronRobinsonMSFT AaronRobinsonMSFT deleted the libunwind_disabled_warnings branch March 23, 2022 20:51
@am11
Copy link
Member

am11 commented Mar 23, 2022

@AaronRobinsonMSFT, sorry I have just noticed this 🤦:
We should revert this file as it is not the one we are using for compilation anymore.

The idea is, src/native/external/{dependency-name}/ directory will be untouched third-party tree. "Our" config files (cmake etc.) will live outside of vendor's directory. Any patch that we apply in vendors tree will have some note in src/native/external/{dependency-name}-version.txt file.

In this case, we are now using src/native/external/libunwind.cmake and src/native/external/libunwind_extras/CMakeLists.txt.

@AaronRobinsonMSFT
Copy link
Member Author

@am11 Are you saying this is the official libunwind version?

@am11
Copy link
Member

am11 commented Mar 23, 2022

Yup src/native/external/libunwind/CMakeLists.txt is the copy of upstream: https://github.com/libunwind/libunwind/blob/v1.6-stable/CMakeLists.txt which we do not use anymore (since #64043).

@AaronRobinsonMSFT
Copy link
Member Author

Okay. I've been updating this in the official libunwind repo too - see libunwind/libunwind#333. I assume this means they will be back in sync?

@am11
Copy link
Member

am11 commented Mar 23, 2022

Ah great, libunwind-version.txt has libunwind/libunwind#333 already listed. All good. 👍

radekdoulik pushed a commit to radekdoulik/runtime that referenced this pull request Mar 30, 2022
@ghost ghost locked as resolved and limited conversation to collaborators Apr 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.

4 participants