Skip to content

Restore orginal file layout for musl and libcxx. NFC. #13154

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 1 commit into from
Jan 11, 2021
Merged

Conversation

sbc100
Copy link
Collaborator

@sbc100 sbc100 commented Dec 31, 2020

Now that we build the sysroot, including the header tree programatically
we can restore the original layout of the musl and libcxx directories.

This will make future updates and comparisons with upstream easier.

This is a followup to #13090

@sbc100 sbc100 force-pushed the move_headers branch 2 times, most recently from 466b521 to b45ebad Compare January 2, 2021 09:46
@sbc100 sbc100 force-pushed the use_sysroot branch 2 times, most recently from 0fbd5b1 to 4bda788 Compare January 8, 2021 23:25
@sbc100 sbc100 force-pushed the use_sysroot branch 4 times, most recently from 356b56d to 647e638 Compare January 9, 2021 18:48
Base automatically changed from use_sysroot to master January 10, 2021 12:09
Now that we build the sysroot, including the header tree programatically
we can restore the original layout of the musl and libcxx directories.

This will make future updates and comparisons with upstream easier.
Copy link
Member

@kripken kripken left a comment

Choose a reason for hiding this comment

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

Nice!

@sbc100 sbc100 merged commit dee59ba into master Jan 11, 2021
@sbc100 sbc100 deleted the move_headers branch January 11, 2021 17:41
sbc100 added a commit to sbc100/emscripten that referenced this pull request Dec 20, 2023
libcxx has direct support for `_NEWLIB_VERSION` in `__locale` so just
use that.  This libcxx support was added in http://reviews.llvm.org/D7888
and landed in emscripten in emscripten-core#13154.
sbc100 added a commit that referenced this pull request Dec 20, 2023
libcxx has direct support for `_NEWLIB_VERSION` in `__locale` so just
use that.  This libcxx support was added in http://reviews.llvm.org/D7888
and landed in emscripten in #13154.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants