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

stdenv/linux: fix patchelf confusion #224945

Merged
merged 2 commits into from Apr 6, 2023
Merged

stdenv/linux: fix patchelf confusion #224945

merged 2 commits into from Apr 6, 2023

Conversation

ghost
Copy link

@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
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.

2 participants