Skip to content

gcc: fix inconsistency in isCross condition #389469

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.

Sign up for GitHub

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
K900 merged 3 commits into from
Mar 13, 2025
Merged

gcc: fix inconsistency in isCross condition #389469

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54849e2
gcc: fix inconsistency in isCross condition
SFrijters Mar 12, 2025
be26b13
gcc: use lib.systems.equals instead of direct equality checking
SFrijters Mar 13, 2025
d8634f9
gcc: appease the formatter
SFrijters Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/common/builder.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

let
forceLibgccToBuildCrtStuff = import ./libgcc-buildstuff.nix { inherit lib stdenv; };
isCross = with stdenv; targetPlatform.config != hostPlatform.config;

@K900 K900 Mar 13, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These really should be lib.systems.equals, all of them, now that I think about it.

@SFrijters SFrijters Mar 13, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Just those three or everything in gcc? A quick git grep 'Platform *[!=]=' | wc -l inside pkgs/development/compilers/gcc gives me 40 hits.

@K900 K900 Mar 13, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Generally, all of them in nixpkgs, technically...

@SFrijters SFrijters Mar 13, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Sure, but I don't want to let this single line change scope creep into doing a treewide update.
I've replaced things inside gcc, a simple rebuild of nix-build -A gcc was a no-op, but I'm not sure how to test this properly.

isCross = with stdenv; targetPlatform != hostPlatform;
in

# We don't support multilib and cross at the same time
Expand Down