diff options
| author | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-11-17 08:26:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-17 08:26:41 +0000 |
| commit | 985ff1cb889d5a438c6812ed827f375c1ee92b99 (patch) | |
| tree | bf9022e6ed92d12682f027eced0fd9da5ded6317 /pkgs/stdenv | |
| parent | 887d33a089c556592b789a7699019babf8aa2402 (diff) | |
| download | nixpkgs-985ff1cb889d5a438c6812ed827f375c1ee92b99.tar nixpkgs-985ff1cb889d5a438c6812ed827f375c1ee92b99.tar.gz nixpkgs-985ff1cb889d5a438c6812ed827f375c1ee92b99.tar.bz2 nixpkgs-985ff1cb889d5a438c6812ed827f375c1ee92b99.tar.lz nixpkgs-985ff1cb889d5a438c6812ed827f375c1ee92b99.tar.xz nixpkgs-985ff1cb889d5a438c6812ed827f375c1ee92b99.tar.zst nixpkgs-985ff1cb889d5a438c6812ed827f375c1ee92b99.zip | |
Update pkgs/stdenv/darwin/make-bootstrap-tools.nix
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index b51b5fdb34b..5be6e2a4e6e 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -2,6 +2,19 @@ , localSystem ? { system = builtins.currentSystem; } # Specify the desired LLVM version in an overlay to avoid the use of # mismatching versions. +# +# The llvmPackages that we take things (clang, libc++ and such) from +# is specified explicitly to be llvmPackages_11 to keep the +# bootstrap-tools stable. However, tools like otool, +# install_name_tool and strip are taken straight from stdenv.cc, +# which, after the bump, is a different LLVM version altogether. +# +# The original intent was that bootstrap-tools specified LLVM 11 +# exhaustively but it didn't. That should be rectified with this +# PR. As to why stick with 11? That's just to keep the +# bootstrap-tools unchanged. +# +# https://github.com/NixOS/nixpkgs/pull/267058/files#r1390889848 , overlays ? [(self: super: { llvmPackages = super.llvmPackages_11; })] , crossSystem ? null , bootstrapFiles ? null |