Skip to content

stdenvBootstrapTools: use cctools-port#243527

Closed
reckenrode wants to merge 1 commit intoNixOS:masterfrom
reckenrode:bootstrapTools-fix
Closed

stdenvBootstrapTools: use cctools-port#243527
reckenrode wants to merge 1 commit intoNixOS:masterfrom
reckenrode:bootstrapTools-fix

Conversation

@reckenrode
Copy link
Copy Markdown
Contributor

@reckenrode reckenrode commented Jul 14, 2023

Description of changes

This fixes the Hydra build failure on staging-next. #241951 (comment)

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.11 Release Notes (or backporting 23.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.

@reckenrode
stdenvBootstrapTools: use cctools-port
1ea66b4 
This fixes the Hydra build failure on staging-next. NixOS#241951 (comment)
@reckenrode reckenrode mentioned this pull request Jul 14, 2023
Closed
@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 Jul 14, 2023
@tjni
Copy link
Copy Markdown
Contributor

tjni commented Jul 14, 2023

I have a PR in #243440 addressing this problem in a different way. I don't have a strong opinion on which one we take. Which one do you prefer?

@reckenrode
Copy link
Copy Markdown
Contributor Author

reckenrode commented Jul 14, 2023

I have a PR in #243440 addressing this problem in a different way. I don't have a strong opinion on which one we take. Which one do you prefer?

I don’t feel strongly either way. If your change (presumably using isMachO to test?) produces a working bootstrap tools, it’s probably more forward-looking than continuing to use cctools-port. On the other hand, the stdenv bootstrap starts from cctools-port and builds from there.

@tjni
Copy link
Copy Markdown
Contributor

tjni commented Jul 14, 2023

I admit I don't know exactly what that bootstrap tools job is testing, but indeed restricting strip and install_name_tool to running only on files that pass isMachO fixes the test locally for me.

@vcunat vcunat changed the base branch from staging-next to master July 15, 2023 17:53
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Jul 15, 2023
@reckenrode
Copy link
Copy Markdown
Contributor Author

reckenrode commented Jul 19, 2023

Closing this since #243440 was merged.

@reckenrode reckenrode closed this Jul 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

6.topic: stdenv Standard environment 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.

2 participants

@reckenrode @tjni