Skip to content

cc-wrapper: Fix eval error#195976

Closed
peperunas wants to merge 1 commit intoNixOS:masterfrom
peperunas:ccwrapper-i686
Closed

cc-wrapper: Fix eval error#195976
peperunas wants to merge 1 commit intoNixOS:masterfrom
peperunas:ccwrapper-i686

Conversation

@peperunas
Copy link
Copy Markdown
Contributor

@peperunas peperunas commented Oct 14, 2022

Description of changes

This issue is part of a series of bugfixes to improve the i686 cross-compilation pipeline.

Tracking issue: #195967

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@peperunas peperunas mentioned this pull request Oct 14, 2022
Open
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Oct 14, 2022
lovesegfault
lovesegfault reviewed Oct 14, 2022
View reviewed changes
pkgs/build-support/cc-wrapper/default.nix

# TODO: categorize these and figure out a better place for them
+ optionalString hostPlatform.isCygwin ''
+ optionalString (hostPlatform.isCygwin || (hostPlatform.isx86_32 && hostPlatform.useLLVM or false)) ''
Copy link
Copy Markdown
Member

@lovesegfault lovesegfault Oct 14, 2022

Choose a reason for hiding this comment

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

Please leave a comment explaining why i686 + LLVM requires disabling PIC

@lovesegfault
Copy link
Copy Markdown
Member

lovesegfault commented Oct 14, 2022

Why is this a separate PR from #196013?

@peperunas
Copy link
Copy Markdown
Contributor Author

peperunas commented Oct 15, 2022

I am sorry @lovesegfault, I opened two PRs for the same issue.

Closing this one, moving into the other.

@peperunas peperunas closed this Oct 15, 2022
@peperunas peperunas mentioned this pull request Oct 15, 2022
Open
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lovesegfault lovesegfault lovesegfault left review comments

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@peperunas @lovesegfault @Ericson2314