Skip to content

stdenv/linux: fix patchelf confusion#224945

Merged
lovesegfault merged 2 commits intostagingfrom
unknown repository
Apr 6, 2023
Merged

stdenv/linux: fix patchelf confusion#224945
lovesegfault merged 2 commits intostagingfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Apr 6, 2023

The stage before xgcc creates the first compiled patchelf (i.e. not from bootstrapFiles).

The xgcc stage was inadvertently switching back to using the patchelf from the bootstrapFiles.

The first commit in this PR adds self-checking comments (assertions) to make it clear where each stage's patchelf comes from.

The second commit fixes the bug, and updates the self-checking comments.

Adam Joseph added 2 commits April 5, 2023 22:18
The stage before `xgcc` creates the first compiled patchelf
(i.e. not from bootstrapFiles).

The `xgcc` stage was inadvertently switching *back* to using the
patchelf *from* the bootstrapFiles.

The first commit in this PR adds self-checking comments (assertions)
to make it clear where each stage's patchelf comes from.

The second commit fixes the bug, and updates the self-checking
comments.
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Apr 6, 2023
@ghost ghost marked this pull request as ready for review April 6, 2023 05:32
@ghost ghost mentioned this pull request Apr 6, 2023
12 tasks
@ghost ghost requested a review from trofi April 6, 2023 05:38
@ofborg ofborg bot added 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Apr 6, 2023
@lovesegfault lovesegfault merged commit b990301 into NixOS:staging Apr 6, 2023
@ghost ghost deleted the pr/patchelf/confusion branch April 6, 2023 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants