diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-31 18:01:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-31 18:01:11 +0000 |
commit | d6ede66f6a6f0542b58b7a7d50265fa111de1b27 (patch) | |
tree | 26050708156188361a0b16bdc35c1eddfba50b63 /pkgs/stdenv | |
parent | c451d8d636d5f35c7b98763e0ffae98679e53087 (diff) | |
parent | 692517bf851f2d8d999f0ad50f53fa1d2dd5c8f9 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 8 | ||||
-rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 1fed692fd1cee..da4a94e34b01a 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -1,5 +1,7 @@ { pkgspath ? ../../.., test-pkgspath ? pkgspath -, system ? builtins.currentSystem, crossSystem ? null, bootstrapFiles ? null +, localSystem ? { system = builtins.currentSystem; } +, crossSystem ? null +, bootstrapFiles ? null }: let cross = if crossSystem != null @@ -11,7 +13,7 @@ let cross = if crossSystem != null in (import "${pkgspath}/pkgs/stdenv/darwin" args').stagesDarwin; } else {}; -in with import pkgspath ({ inherit system; } // cross // custom-bootstrap); +in with import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap); let llvmPackages = llvmPackages_11; @@ -364,7 +366,7 @@ in rec { test-pkgs = import test-pkgspath { # if the bootstrap tools are for another platform, we should be testing # that platform. - system = if crossSystem != null then crossSystem else system; + localSystem = if crossSystem != null then crossSystem else localSystem; stdenvStages = args: let args' = args // { inherit bootstrapLlvmVersion bootstrapFiles; }; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index d23a996dfcb48..b2d04c8667d5f 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -1,9 +1,6 @@ -{ localSystem ? { system = builtins.currentSystem; } -, crossSystem ? null -}: +{ pkgs ? import ../../.. {} }: let - pkgs = import ../../.. { inherit localSystem crossSystem; }; libc = pkgs.stdenv.cc.libc; in with pkgs; rec { |