Skip to content

chromium: (cross): use cc-wrapper-clang instead of bare clang#227720

Merged
Mindavi merged 1 commit intomasterfrom
unknown repository
Jul 5, 2023
Merged

chromium: (cross): use cc-wrapper-clang instead of bare clang#227720
Mindavi merged 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Apr 23, 2023

Description of changes

Prior to this commit chromium was writing the bare, unwrapped clang path into gnFlags. When called without the wrapper, clang doesn't know that the linker for cross compilation isn't called lld anymore -- it is called ${targetPrefix}-lld.

This commit fixes that problem by referencing the cc-wrapper-ified clang which is part of llvmPackages.stdenv.

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/)
  • 23.05 Release Notes (or backporting 22.11 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.

@ofborg ofborg bot added 6.topic: cross-compilation Building packages on a different platform than they will be used on 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 Apr 23, 2023
@ghost
Copy link
Author

ghost commented Apr 24, 2023

Alright, this project will need to wait until after ZHF.

@ghost ghost marked this pull request as draft April 24, 2023 02:15
Prior to this commit chromium was writing the bare, unwrapped
`clang` path into `gnFlags`.  When called without the wrapper, clang
doesn't know that the linker for cross compilation isn't called
`lld` anymore -- it is called `${targetPrefix}-lld`.

This commit fixes that problem by referencing the cc-wrapper-ified
clang which is part of `llvmPackages.stdenv`.
@ghost ghost mentioned this pull request May 1, 2023
4 tasks
@ghost ghost marked this pull request as ready for review June 21, 2023 05:12
@Mindavi Mindavi merged commit 6659133 into NixOS:master Jul 5, 2023
@ghost ghost deleted the pr/chromium/cross/use-wrapper branch July 12, 2023 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 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

Development

Successfully merging this pull request may close these issues.

1 participant