cc-wrapper: Remove unused params
Ensured hashes unchanged and eval succeeds in tarball job
This commit is contained in:
@@ -77,7 +77,6 @@ in rec {
|
||||
cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper {
|
||||
inherit shell;
|
||||
inherit (last) stdenv;
|
||||
inherit (last.pkgs.darwin) dyld;
|
||||
|
||||
nativeTools = true;
|
||||
nativePrefix = bootstrapTools;
|
||||
@@ -85,8 +84,6 @@ in rec {
|
||||
buildPackages = lib.optionalAttrs (last ? stdenv) {
|
||||
inherit (last) stdenv;
|
||||
};
|
||||
hostPlatform = localSystem;
|
||||
targetPlatform = localSystem;
|
||||
libc = last.pkgs.darwin.Libsystem;
|
||||
isClang = true;
|
||||
cc = { name = "clang-9.9.9"; outPath = bootstrapTools; };
|
||||
@@ -314,10 +311,7 @@ in rec {
|
||||
buildPackages = {
|
||||
inherit (prevStage) stdenv;
|
||||
};
|
||||
hostPlatform = localSystem;
|
||||
targetPlatform = localSystem;
|
||||
inherit (pkgs) coreutils binutils gnugrep;
|
||||
inherit (pkgs.darwin) dyld;
|
||||
cc = pkgs.llvmPackages.clang-unwrapped;
|
||||
libc = pkgs.darwin.Libsystem;
|
||||
};
|
||||
|
||||
@@ -40,8 +40,6 @@ let inherit (localSystem) system; in
|
||||
targetPlatform = localSystem;
|
||||
inherit config;
|
||||
initialPath = [ "/" "/usr" ];
|
||||
hostPlatform = localSystem;
|
||||
targetPlatform = localSystem;
|
||||
shell = "${bootstrapTools}/bin/bash";
|
||||
fetchurlBoot = null;
|
||||
cc = null;
|
||||
@@ -55,13 +53,11 @@ let inherit (localSystem) system; in
|
||||
|
||||
stdenv = import ../generic {
|
||||
name = "stdenv-freebsd-boot-0";
|
||||
buildPlatform = localSystem;
|
||||
hostPlatform = localSystem;
|
||||
targetPlatform = localSystem;
|
||||
inherit config;
|
||||
initialPath = [ prevStage.bootstrapTools ];
|
||||
inherit (prevStage.stdenv)
|
||||
hostPlatform targetPlatform shell;
|
||||
buildPlatform hostPlatform targetPlatform
|
||||
shell;
|
||||
fetchurlBoot = prevStage.fetchurl;
|
||||
cc = null;
|
||||
};
|
||||
@@ -71,13 +67,11 @@ let inherit (localSystem) system; in
|
||||
inherit config overlays;
|
||||
stdenv = import ../generic {
|
||||
name = "stdenv-freebsd-boot-3";
|
||||
buildPlatform = localSystem;
|
||||
hostPlatform = localSystem;
|
||||
targetPlatform = localSystem;
|
||||
inherit config;
|
||||
|
||||
inherit (prevStage.stdenv)
|
||||
hostPlatform targetPlatform initialPath shell fetchurlBoot;
|
||||
buildPlatform hostPlatform targetPlatform
|
||||
initialPath shell fetchurlBoot;
|
||||
|
||||
cc = import ../../build-support/cc-wrapper {
|
||||
nativeTools = true;
|
||||
|
||||
@@ -79,8 +79,6 @@ let
|
||||
buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
|
||||
inherit (prevStage) stdenv;
|
||||
};
|
||||
hostPlatform = localSystem;
|
||||
targetPlatform = localSystem;
|
||||
cc = prevStage.gcc-unwrapped;
|
||||
isGNU = true;
|
||||
libc = prevStage.glibc;
|
||||
@@ -244,8 +242,6 @@ in
|
||||
buildPackages = {
|
||||
inherit (prevStage) stdenv;
|
||||
};
|
||||
hostPlatform = localSystem;
|
||||
targetPlatform = localSystem;
|
||||
cc = prevStage.gcc-unwrapped;
|
||||
libc = self.glibc;
|
||||
inherit (self) stdenv binutils coreutils gnugrep;
|
||||
|
||||
@@ -13,12 +13,10 @@ bootStages ++ [
|
||||
inherit config overlays;
|
||||
|
||||
stdenv = import ../generic rec {
|
||||
buildPlatform = localSystem;
|
||||
hostPlatform = localSystem;
|
||||
targetPlatform = localSystem;
|
||||
|
||||
inherit config;
|
||||
|
||||
inherit (prevStage.stdenv) buildPlatform hostPlatform targetPlatform;
|
||||
|
||||
preHook = ''
|
||||
export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
|
||||
export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
|
||||
@@ -27,8 +25,6 @@ bootStages ++ [
|
||||
|
||||
initialPath = (import ../common-path.nix) { pkgs = prevStage; };
|
||||
|
||||
inherit (prevStage.stdenv) hostPlatform targetPlatform;
|
||||
|
||||
cc = import ../../build-support/cc-wrapper {
|
||||
nativeTools = false;
|
||||
nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr";
|
||||
|
||||
Reference in New Issue
Block a user