public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv: linux: give distinct names to all the stages

Browse Source 
Mainly for debugging.
This commit is contained in:
Jan Malakhovski 2018-02-01 00:00:00 +00:00
parent 522437362a
commit e654d9a9ca
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ let
let let
thisStdenv = import ../generic { thisStdenv = import ../generic {
name = "stdenv-linux-boot"; name = "${name}-stdenv-linux";
buildPlatform = localSystem; buildPlatform = localSystem;
hostPlatform = localSystem; hostPlatform = localSystem;
targetPlatform = localSystem; targetPlatform = localSystem;
@ -88,6 +88,7 @@ let
cc = if isNull prevStage.gcc-unwrapped cc = if isNull prevStage.gcc-unwrapped
then null then null
else lib.makeOverridable (import ../../build-support/cc-wrapper) { else lib.makeOverridable (import ../../build-support/cc-wrapper) {
name = "${name}-gcc-wrapper";
nativeTools = false; nativeTools = false;
propagateDoc = false; propagateDoc = false;
nativeLibc = false; nativeLibc = false;
@ -99,7 +100,6 @@ let
isGNU = true; isGNU = true;
libc = getLibc prevStage; libc = getLibc prevStage;
inherit (prevStage) coreutils gnugrep; inherit (prevStage) coreutils gnugrep;
name = name;
stdenvNoCC = prevStage.ccWrapperStdenv; stdenvNoCC = prevStage.ccWrapperStdenv;
}; };
@ -139,7 +139,7 @@ in
# Build a dummy stdenv with no GCC or working fetchurl. This is # Build a dummy stdenv with no GCC or working fetchurl. This is
# because we need a stdenv to build the GCC wrapper and fetchurl. # because we need a stdenv to build the GCC wrapper and fetchurl.
(prevStage: stageFun prevStage { (prevStage: stageFun prevStage {
name = null; name = "bootstrap-stage0";
overrides = self: super: { overrides = self: super: {
# We thread stage0's stdenv through under this name so downstream stages # We thread stage0's stdenv through under this name so downstream stages
@ -153,7 +153,7 @@ in
# create a dummy Glibc here, which will be used in the stdenv of # create a dummy Glibc here, which will be used in the stdenv of
# stage1. # stage1.
${localSystem.libc} = self.stdenv.mkDerivation { ${localSystem.libc} = self.stdenv.mkDerivation {
name = "bootstrap-${localSystem.libc}"; name = "bootstrap-stage0-${localSystem.libc}";
buildCommand = '' buildCommand = ''
mkdir -p $out mkdir -p $out
ln -s ${bootstrapTools}/lib $out/lib ln -s ${bootstrapTools}/lib $out/lib
@ -165,13 +165,13 @@ in
}; };
gcc-unwrapped = bootstrapTools; gcc-unwrapped = bootstrapTools;
binutils = import ../../build-support/bintools-wrapper { binutils = import ../../build-support/bintools-wrapper {
name = "bootstrap-stage0-binutils-wrapper";
nativeTools = false; nativeTools = false;
nativeLibc = false; nativeLibc = false;
buildPackages = { }; buildPackages = { };
libc = getLibc self; libc = getLibc self;
inherit (self) stdenvNoCC coreutils gnugrep; inherit (self) stdenvNoCC coreutils gnugrep;
bintools = bootstrapTools; bintools = bootstrapTools;
name = "bootstrap-binutils-wrapper";
}; };
coreutils = bootstrapTools; coreutils = bootstrapTools;
gnugrep = bootstrapTools; gnugrep = bootstrapTools;
@ -190,7 +190,7 @@ in
# simply re-export those packages in the middle stage(s) using the # simply re-export those packages in the middle stage(s) using the
# overrides attribute and the inherit syntax. # overrides attribute and the inherit syntax.
(prevStage: stageFun prevStage { (prevStage: stageFun prevStage {
name = "bootstrap-gcc-wrapper"; name = "bootstrap-stage1";
# Rebuild binutils to use from stage2 onwards. # Rebuild binutils to use from stage2 onwards.
overrides = self: super: { overrides = self: super: {
@ -214,7 +214,7 @@ in
# 2nd stdenv that contains our own rebuilt binutils and is used for # 2nd stdenv that contains our own rebuilt binutils and is used for
# compiling our own Glibc. # compiling our own Glibc.
(prevStage: stageFun prevStage { (prevStage: stageFun prevStage {
name = "bootstrap-gcc-wrapper"; name = "bootstrap-stage2";
overrides = self: super: { overrides = self: super: {
inherit (prevStage) inherit (prevStage)
@ -235,7 +235,7 @@ in
# one uses the rebuilt Glibc from stage2. It still uses the recent # one uses the rebuilt Glibc from stage2. It still uses the recent
# binutils and rest of the bootstrap tools, including GCC. # binutils and rest of the bootstrap tools, including GCC.
(prevStage: stageFun prevStage { (prevStage: stageFun prevStage {
name = "bootstrap-gcc-wrapper"; name = "bootstrap-stage3";
overrides = self: super: rec { overrides = self: super: rec {
inherit (prevStage) inherit (prevStage)
@ -263,7 +263,7 @@ in
# Construct a fourth stdenv that uses the new GCC. But coreutils is # Construct a fourth stdenv that uses the new GCC. But coreutils is
# still from the bootstrap tools. # still from the bootstrap tools.
(prevStage: stageFun prevStage { (prevStage: stageFun prevStage {
name = ""; name = "bootstrap-stage4";
overrides = self: super: { overrides = self: super: {
# Zlib has to be inherited and not rebuilt in this stage, # Zlib has to be inherited and not rebuilt in this stage,
@ -292,7 +292,6 @@ in
bintools = self.binutils; bintools = self.binutils;
libc = getLibc self; libc = getLibc self;
inherit (self) stdenvNoCC coreutils gnugrep; inherit (self) stdenvNoCC coreutils gnugrep;
name = "";
shell = self.bash + "/bin/bash"; shell = self.bash + "/bin/bash";
}; };
}; };
@ -311,6 +310,8 @@ in
(prevStage: { (prevStage: {
inherit config overlays; inherit config overlays;
stdenv = import ../generic rec { stdenv = import ../generic rec {
name = "stdenv-linux";
buildPlatform = localSystem; buildPlatform = localSystem;
hostPlatform = localSystem; hostPlatform = localSystem;
targetPlatform = localSystem; targetPlatform = localSystem;