nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 15:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor wrapGCC in stdenvLinux

Browse Source 
Don't use default parameter values, to make the callsites more readable
and for easier debuggability/changability.  Also reordered the
callsites' parameter ordering for consistency.

In the final stdenv don't repeat the name of the shell.

This commit doesn't change the outhash (or drvhash) of the stdenv.
This commit is contained in:
Gergely Risko 2014-08-23 20:45:32 +02:00
parent 8a445f9237
commit 142970b9eb
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/stdenv/linux/default.nix
View File

@ -118,12 +118,12 @@ rec {
# A helper function to call gcc-wrapper.
wrapGCC =
{ gcc ? bootstrapTools, libc, binutils, coreutils, shell ? "", name ? "bootstrap-gcc-wrapper" }:
{ gcc, libc, binutils, coreutils, name }:
lib.makeOverridable (import ../../build-support/gcc-wrapper) {
nativeTools = false;
nativeLibc = false;
inherit gcc binutils coreutils libc shell name;
inherit gcc binutils coreutils libc name;
stdenv = stdenvLinuxBoot0;
};
@ -133,9 +133,11 @@ rec {
# configure script happy.
stdenvLinuxBoot1 = stdenvBootFun {
gcc = wrapGCC {
gcc = bootstrapTools;
libc = bootstrapGlibc;
binutils = bootstrapTools;
coreutils = bootstrapTools;
name = "bootstrap-gcc-wrapper";
};
};
@ -155,9 +157,11 @@ rec {
# 3) 2nd stdenv that we will use to build only Glibc.
stdenvLinuxBoot2 = stdenvBootFun {
gcc = wrapGCC {
gcc = bootstrapTools;
libc = bootstrapGlibc;
binutils = binutils1;
coreutils = bootstrapTools;
name = "bootstrap-gcc-wrapper";
};
overrides = pkgs: {
inherit (stdenvLinuxBoot1Pkgs) perl;
@ -183,9 +187,11 @@ rec {
# binutils and rest of the bootstrap tools, including GCC.
stdenvLinuxBoot3 = stdenvBootFun {
gcc = wrapGCC {
gcc = bootstrapTools;
libc = stdenvLinuxGlibc;
binutils = binutils1;
coreutils = bootstrapTools;
libc = stdenvLinuxGlibc;
name = "bootstrap-gcc-wrapper";
};
overrides = pkgs: {
glibc = stdenvLinuxGlibc;
@ -219,10 +225,10 @@ rec {
# (e.g. coreutils) are still from the bootstrap tools.
stdenvLinuxBoot4 = stdenvBootFun {
gcc = wrapGCC rec {
gcc = stdenvLinuxBoot3Pkgs.gcc.gcc;
libc = stdenvLinuxGlibc;
binutils = binutils1;
coreutils = bootstrapTools;
libc = stdenvLinuxGlibc;
gcc = stdenvLinuxBoot3Pkgs.gcc.gcc;
name = "";
};
extraPath = [ stdenvLinuxBoot3Pkgs.xz ];
@ -262,16 +268,15 @@ rec {
((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;})
++ [stdenvLinuxBoot4Pkgs.patchelf stdenvLinuxBoot4Pkgs.paxctl ];
gcc = wrapGCC rec {
inherit (stdenvLinuxBoot4Pkgs) binutils coreutils;
libc = stdenvLinuxGlibc;
gcc = stdenvLinuxBoot4.gcc.gcc;
shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
name = "";
};
shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
gcc = (wrapGCC rec {
gcc = stdenvLinuxBoot4.gcc.gcc;
libc = stdenvLinuxGlibc;
inherit (stdenvLinuxBoot4Pkgs) binutils coreutils;
name = "";
}).override { inherit shell; };
fetchurlBoot = stdenvLinuxBoot0.fetchurlBoot;
extraAttrs = {