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

chromium: (cross) strip aarch64-linux-gnu- toolprefix only for native builds #227723

Merged
merged 1 commit into from Jun 23, 2023
Merged

chromium: (cross) strip aarch64-linux-gnu- toolprefix only for native builds #227723

merged 1 commit into from Jun 23, 2023

Conversation

ghost
Copy link

@ghost ghost commented Apr 23, 2023

Description of changes

Our existing chromium expression strips the aarch64-linux-gnu- prefix off of toolchain names (like aarch64-linux-gnu-gcc) for all Aarch64 builds. But when we are doing a cross compile to an Aarch64 hostPlatform we need to leave those prefixes in place.

This commit makes the prefix-stripping conditional on the build being a native build.

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.

… builds

Our existing chromium expression strips the `aarch64-linux-gnu-`
prefix off of toolchain names (like `aarch64-linux-gnu-gcc`) for all
`Aarch64` builds.  But when we are doing a cross compile *to* an
`Aarch64` hostPlatform we need to leave those prefixes in place.

This commit makes the prefix-stripping conditional on the build
being a native build.
@ofborg ofborg bot added 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 0 10.rebuild-linux: 0 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
@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:14
@Artturin Artturin merged commit 66e9607 into NixOS:master Jun 23, 2023
@ghost ghost deleted the pr/chromium/dont-strip-prefixes-for-cross branch June 26, 2023 08:37
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 sort platform than than they will be run on 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant