Skip to content

[Backport staging-22.11] libcxx: link correct libcxxabi version#203425

Merged
vcunat merged 3 commits intostaging-22.11from
backport-201268-to-staging-22.11
Dec 17, 2022
Merged

[Backport staging-22.11] libcxx: link correct libcxxabi version#203425
vcunat merged 3 commits intostaging-22.11from
backport-201268-to-staging-22.11

Conversation

@github-actions
Copy link
Contributor

Bot-based backport to staging-22.11, triggered by a label in #201268.

  • Before merging, ensure that this backport complies with the Criteria for Backporting.
    • Even as a non-commiter, if you find that it does not comply, leave a comment.

Same adjustment as made for libc++abi in #185766, for the same reason:
the unamended dylib links to the libc++abi in the build stdenv, which
is the wrong version.

Tested on Darwin with LLVM 14 stdenv, but the phase is added to all
versions, including 11 - so this will cause a mass rebuild.

See: #185766
(cherry picked from commit 67f11a2)
Apart from being a no-op, this seems to cause the install to make a
copy, rather than keeping the symlinks intact.

(cherry picked from commit 252ea65)
This is to fix the stdenvBootstrapTools issue where otool & others are
not available in PATH, but only under the targetPrefix.

(cherry picked from commit 2252245)
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Nov 28, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Nov 28, 2022
@vcunat vcunat merged commit 9cdb7ee into staging-22.11 Dec 17, 2022
@Artturin Artturin deleted the backport-201268-to-staging-22.11 branch April 7, 2023 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants