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.

Sign up for GitHub

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

Jump to bottom

[staging-next] stdenvBootstrapTools: fix cycle on aarch64-darwin #196909

Merged
merged 1 commit into from
Nov 5, 2022
Merged

[staging-next] stdenvBootstrapTools: fix cycle on aarch64-darwin #196909

merged 1 commit into from
Nov 5, 2022

Conversation

stephank
Copy link
Contributor

@stephank stephank commented Oct 20, 2022 •
edited
Loading

Description of changes

This fixes the issue highlighted in: #186575 (comment)

There were actually two culprits:

  • compiler-rt: build builtins on darwin #186575 uses helpers from trivial-builders.nix to write shell scripts for xcbuild.xcrun, but those rely on runtimeShell which is apparently not possible at this stage. (I guess they create a dependency on the final stdenv, instead of whatever stdenv stage is part of bootstrap-tools?)
  • Migrate from glibc's libcrypt to libxcrypt #181764 adds a dependency on libxcrypt to LLVM compiler-rt, but I believe this should be glibc specific. I changed the conditions to reflect this.

I only tested evaluation of {aarch64,x86_64}-darwin.

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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 20, 2022
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild label Oct 20, 2022
@vcunat vcunat changed the base branch from staging-next to staging October 20, 2022 13:07
@vcunat
Copy link
Member

vcunat commented Oct 20, 2022

Retargeted due to too many rebuilds on darwin.

@stephank
Copy link
Contributor Author

stephank commented Nov 3, 2022 •
edited
Loading

Ping! I was told this issue would block a 22.11 release channel for Darwin. In that case, we may have only a couple staging-next cycles left to merge this?

@mweinelt
Copy link
Member

mweinelt commented Nov 3, 2022 •
edited
Loading

I approve of the compiler-rt changes, no clue about everything else.

@vcunat vcunat merged commit b33eacb into NixOS:staging Nov 5, 2022
@stephank stephank deleted the fix/darwin-eval branch November 5, 2022 15:38
@rrbutani rrbutani mentioned this pull request Nov 7, 2022
Merged
92 tasks
@vcunat
Copy link
Member

vcunat commented Nov 10, 2022

The error message changed, but it's still failing on Hydra:
https://hydra.nixos.org/build/197835103

@stephank
Copy link
Contributor Author

I'm away for a few more days, but I appear to have broken it in #185766 by introducing otool.

@joshchngs joshchngs mentioned this pull request Nov 15, 2022
Merged
13 tasks
@stephank stephank mentioned this pull request Nov 22, 2022
Merged
13 tasks
rrbutani added a commit to rrbutani/nixpkgs that referenced this pull request Dec 14, 2022
@rrbutani
llvmPackages_15.compiler_rt: apply NixOS#196909 to LLVM 15
cf2d5cb 
`llvmPackages_15` originates from `llvmPackages_git` which does
not include this change
rrbutani added a commit to rrbutani/nixpkgs that referenced this pull request Jan 8, 2023
@rrbutani
llvmPackages_15.compiler_rt: apply NixOS#196909 to LLVM 15
3bb5d8b 
`llvmPackages_15` originates from `llvmPackages_git` which does
not include this change
ElvishJerricco pushed a commit to ElvishJerricco/nixpkgs that referenced this pull request Jan 8, 2023
@rrbutani @ElvishJerricco
llvmPackages_15.compiler_rt: apply NixOS#196909 to LLVM 15
18d8abb 
`llvmPackages_15` originates from `llvmPackages_git` which does
not include this change
rrbutani added a commit to rrbutani/nixpkgs that referenced this pull request Jan 10, 2023
@rrbutani
llvmPackages_15.compiler_rt: apply NixOS#196909 to LLVM 15
59ca476 
`llvmPackages_15` originates from `llvmPackages_git` which does
not include this change
rrbutani added a commit to rrbutani/nixpkgs that referenced this pull request Jan 27, 2023
@rrbutani
llvmPackages_15.compiler_rt: apply NixOS#196909 to LLVM 15
3b6d98d 
`llvmPackages_15` originates from `llvmPackages_git` which does
not include this change
rrbutani added a commit to rrbutani/nixpkgs that referenced this pull request Jan 27, 2023
@rrbutani
llvmPackages_15.compiler-rt: gate the libxcrypt dep on `plat.libc =…
d729907 
…= "glibc"`

This restores this check to what it originally was in NixOS#196909 (see:
NixOS#196909 (comment)) and
lets `compiler-rt` eval successfully when trying to compile the
`llvmPackages_15` set for mingw targets (i.e. a platform that *is* GNU
but does *not* use glibc).

---

It's not clear to me what the `haveLibc` check is doing here (platforms
that seem to use glibc like `x86_64-linux` and have
`plat.libc == "glibc"` have `haveLibc = false` because `stdenv.cc.libc`
is `null`).
github-actions bot pushed a commit that referenced this pull request Jan 28, 2023
@rrbutani @github-actions
llvmPackages_15.compiler_rt: apply #196909 to LLVM 15
a7d2d75 
`llvmPackages_15` originates from `llvmPackages_git` which does
not include this change

(cherry picked from commit 3b6d98d)
github-actions bot pushed a commit that referenced this pull request Jan 28, 2023
@rrbutani @github-actions
llvmPackages_15.compiler-rt: gate the libxcrypt dep on `plat.libc =…
572014a 
…= "glibc"`

This restores this check to what it originally was in #196909 (see:
#196909 (comment)) and
lets `compiler-rt` eval successfully when trying to compile the
`llvmPackages_15` set for mingw targets (i.e. a platform that *is* GNU
but does *not* use glibc).

---

It's not clear to me what the `haveLibc` check is doing here (platforms
that seem to use glibc like `x86_64-linux` and have
`plat.libc == "glibc"` have `haveLibc = false` because `stdenv.cc.libc`
is `null`).

(cherry picked from commit d729907)
K900 pushed a commit that referenced this pull request Jan 28, 2023
@rrbutani @K900
llvmPackages_15.compiler_rt: apply #196909 to LLVM 15
e2b34ab 
`llvmPackages_15` originates from `llvmPackages_git` which does
not include this change
K900 pushed a commit that referenced this pull request Jan 28, 2023
@rrbutani @K900
llvmPackages_15.compiler-rt: gate the libxcrypt dep on `plat.libc =…
fde7598 
…= "glibc"`

This restores this check to what it originally was in #196909 (see:
#196909 (comment)) and
lets `compiler-rt` eval successfully when trying to compile the
`llvmPackages_15` set for mingw targets (i.e. a platform that *is* GNU
but does *not* use glibc).

---

It's not clear to me what the `haveLibc` check is doing here (platforms
that seem to use glibc like `x86_64-linux` and have
`plat.libc == "glibc"` have `haveLibc = false` because `stdenv.cc.libc`
is `null`).
xanderio pushed a commit to xanderio/nixpkgs that referenced this pull request Feb 13, 2023
@rrbutani @xanderio
llvmPackages_15.compiler_rt: apply NixOS#196909 to LLVM 15
18a7ffa 
`llvmPackages_15` originates from `llvmPackages_git` which does
not include this change
xanderio pushed a commit to xanderio/nixpkgs that referenced this pull request Feb 13, 2023
@rrbutani @xanderio
llvmPackages_15.compiler-rt: gate the libxcrypt dep on `plat.libc =…
0421cd1 
…= "glibc"`

This restores this check to what it originally was in NixOS#196909 (see:
NixOS#196909 (comment)) and
lets `compiler-rt` eval successfully when trying to compile the
`llvmPackages_15` set for mingw targets (i.e. a platform that *is* GNU
but does *not* use glibc).

---

It's not clear to me what the `haveLibc` check is doing here (platforms
that seem to use glibc like `x86_64-linux` and have
`plat.libc == "glibc"` have `haveLibc = false` because `stdenv.cc.libc`
is `null`).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@mweinelt mweinelt Awaiting requested review from mweinelt

@vcunat vcunat Awaiting requested review from vcunat

@fpletz fpletz Awaiting requested review from fpletz

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@dtzWill dtzWill Awaiting requested review from dtzWill

@lovek323 lovek323 Awaiting requested review from lovek323

@primeos primeos Awaiting requested review from primeos

Assignees
No one assigned
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: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@stephank @vcunat @mweinelt @SuperSandro2000