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

darwin.xnu: use unwrapped clang for MIGCC #324440

Merged
merged 1 commit into from
Jul 13, 2024

Conversation

paparodeo
Copy link
Contributor

@paparodeo paparodeo commented Jul 3, 2024

Description of changes

#324155 (comment)

the mig header build requires a 32 bit arch but the wrapped compiler specifies -arch 64-bit-arch on the command line causing compile failures. This was worked around for aarch64 by patching out the 32 bit arch but that ignores the comment and the code saying that 32 bit arch is required and thus will generate the wrong sizes for the structures in the headers. Using the unwrapped clang mig can pass whatever arch it desires.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jul 4, 2024
@paparodeo
Copy link
Contributor Author

xnu headers built fine on aarch64

moving to staging.

@paparodeo paparodeo changed the base branch from master to staging July 4, 2024 04:12
@paparodeo paparodeo marked this pull request as ready for review July 4, 2024 04:12
@paparodeo
Copy link
Contributor Author

cc: @reckenrode @toonn

Copy link
Contributor

@toonn toonn left a comment

Choose a reason for hiding this comment

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

LGTM, I think this is what I asked for in one of my questions on the other PR. I'll run a build on x86_64-darwin to verify.

libunistring was broken on staging for a bit, so still running the build.

@paparodeo
Copy link
Contributor Author

paparodeo commented Jul 9, 2024

#324155 (comment) merged. marking this as draft till it makes it to staging so i can rebase and fix the merge conflict i created

[edit] rebased and resolved.

@paparodeo paparodeo marked this pull request as draft July 9, 2024 01:23
the mig header build requires a 32 bit arch but the wrapped compiler
specifies `-arch 64-bit-arch` on the command line causing compile
failures. This was worked around for aarch64 by patching out the 32 bit
arch but that ignores the comment and the code saying that 32 bit arch
is required and thus will generate the wrong sizes for the structures in
the headers. Using the unwrapped clang mig can pass whatever arch it
desires.
@paparodeo paparodeo marked this pull request as ready for review July 10, 2024 23:47
Copy link
Contributor

@toonn toonn left a comment

Choose a reason for hiding this comment

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

stdenv built on x86_64-darwin, that's enough to get my stamp of approval.

@toonn toonn merged commit 633f0c5 into NixOS:staging Jul 13, 2024
26 checks passed
@paparodeo paparodeo deleted the xnu-unwrapped-clang branch July 13, 2024 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants