gcc.libgcc: compare host and target platforms, rather than their triples#264976
Merged
2 commits merged intomasterfrom Nov 4, 2023
unknown repository
Merged
gcc.libgcc: compare host and target platforms, rather than their triples#2649762 commits merged intomasterfrom unknown repository
2 commits merged intomasterfrom
unknown repository
Conversation
ofborg
bot
added
the
6.topic: cross-compilation
ghost
changed the title
ofborg
bot
added
10.rebuild-darwin: 0
github-actions
bot
added
6.topic: python
ghost
marked this pull request as ready for review
github-actions
bot
removed
6.topic: python
Author
|
@ofborg build pkgsCross.gnu64_simplekernel.bash |
ofborg
bot
added
10.rebuild-darwin: 11-100
ofborg
bot
added
10.rebuild-darwin: 501+
Ericson2314
reviewed
Nov 2, 2023
pkgs/shells/bash/5.nix
Outdated
Member
There was a problem hiding this comment.
Why this change? I've never seen depending on entire other stdenvs like that.
Member
There was a problem hiding this comment.
If we just skip this, everything else looks good to me.
Author
There was a problem hiding this comment.
Why this change?
Because !(buildPackages.stdenv.cc?__spliced).
See #264992 for the test case.
The reproducer requires two platforms which have the same triple but aren't ==-equal to each other. People are creating them on their own and getting burned by this. Latest example:
There aren't any in lib.systems.examples, so #264992 adds one in order to be able to answer your question "why this change".
Author
There was a problem hiding this comment.
If we just skip this, everything else looks good to me.
I moved it into
ghost
changed the title
ghost
mentioned this pull request
13 tasks
ofborg
bot
added
10.rebuild-darwin: 0
Member
|
It looks like this should fix #263040, except you missed a comparison, |
ghost
marked this pull request as draft
Author
We have several cross-compilation bugs that show up if hostPlatform!=buildPlatform yet hostPlatform.config==buildPlatform.config. These bugs have appeared and disappeared as we've fiddled with the definition of equality for platform objects. This commit adds a clear-cut case where they are *not* equal and never will be, so we can test it.
…ples
The rest of our gcc expression prepends "${targetPlatform.config}-"
to paths and binaries if `hostPlatform!=targetPlatform`. The
`libgcc.nix` expression was using
'hostPlatform.config!=targetPlatform.config`, which caused it to
look in the wrong place when moving files. This commit corrects that.
Author
I have verified that your test case (deflakified below) builds correctly at a37a7d2 |
ghost
marked this pull request as ready for review
Author
|
I rebuilt the entire This won't break anything. If it does I take full responsibility. |
This pull request was closed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
The rest of our gcc expression prepends
"${targetPlatform.config}-"to paths and binaries ifhostPlatform!=targetPlatform. Thelibgcc.nixexpression was usinghostPlatform.config!=targetPlatform.config, which caused it to look in the wrong place when moving files. This commit corrects that.Closes #263040
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)