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

* Switching.

Browse Source 
svn path=/nixpkgs/trunk/; revision=6827
This commit is contained in:
Eelco Dolstra
2006-10-24 20:53:54 +00:00
parent ec0d20103c
commit 60a9aa66bf
7 changed files with 23 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/linux/bootstrap/i686/default.nix
+8 -8
View File
@@ -6,22 +6,22 @@
tar = ./tar.bz2;
staticToolsURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6800/static-tools.tar.bz2;
sha1 = "18c5e93a23a16282a12e9af05f4dc28254dc9013";
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6824/static-tools.tar.bz2;
sha1 = "4cc936e5c5881eb1466dd8c2cb968e255fa446b7";
};
binutilsURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6800/binutils.tar.bz2;
sha1 = "4bf2859aa705acdcc08d333200f0e55754fab4a9";
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6824/binutils.tar.bz2;
sha1 = "d7d85684fae7ec5b51d31e105f8fc041a3553c82";
};
gccURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6800/gcc.tar.bz2;
sha1 = "bd69a67b779014a683fa93706497eef0afede2b2";
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6824/gcc.tar.bz2;
sha1 = "c1a6f1a6de2cd3cc1b112614661c9f6adf8a6377";
};
glibcURL = {
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6800/glibc.tar.bz2;
sha1 = "9f3f3f1248d672d5a845326ed36d8ca470de0094";
url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6824/glibc.tar.bz2;
sha1 = "666b5a6c179bd6aedeeb40d34336716eb0d659ce";
};
}
pkgs/stdenv/linux/new.nix
+9 -21
View File
@@ -62,21 +62,11 @@ rec {
# A helper function to call gcc-wrapper.
wrapGCC =
{gcc ? staticGCC, glibc, binutils, shell ? ""}:
{gcc ? staticGCC, libc, binutils, shell ? ""}:
(import ../../build-support/gcc-wrapper) {
nativeTools = false;
nativeLibc = false;
inherit gcc binutils glibc shell;
stdenv = stdenvInitial;
};
wrapGCC2 =
{gcc ? staticGCC, glibc, binutils, shell ? ""}:
(import ../../build-support/gcc-wrapper-new) {
nativeTools = false;
nativeLibc = false;
inherit gcc binutils shell;
libc = glibc;
inherit gcc binutils libc shell;
stdenv = stdenvInitial;
};
@@ -126,7 +116,7 @@ rec {
# the gcc configure script happy.
stdenvLinuxBoot1 = stdenvBootFun {
# Use the statically linked, downloaded glibc/gcc/binutils.
gcc = wrapGCC {glibc = staticGlibc; binutils = staticBinutils;};
gcc = wrapGCC {libc = staticGlibc; binutils = staticBinutils;};
staticGlibc = true;
extraAttrs = {inherit curl;};
};
@@ -150,7 +140,7 @@ rec {
# statically linked tools.
stdenvLinuxBoot2 = removeAttrs (stdenvBootFun {
staticGlibc = false;
gcc = wrapGCC2 {binutils = staticBinutils; glibc = stdenvLinuxGlibc;};
gcc = wrapGCC {binutils = staticBinutils; libc = stdenvLinuxGlibc;};
extraAttrs = {inherit curl; glibc = stdenvLinuxGlibc;};
}) ["gcc" "binutils"];
@@ -167,10 +157,9 @@ rec {
# 5. The other tools (e.g. coreutils) are still static.
stdenvLinuxBoot3 = stdenvBootFun {
staticGlibc = false;
gcc = wrapGCC2 {
# inherit (stdenvLinuxBoot2Pkgs) binutils;
binutils = stdenvLinuxBoot2Pkgs.binutils217;
glibc = stdenvLinuxGlibc;
gcc = wrapGCC {
inherit (stdenvLinuxBoot2Pkgs) binutils;
libc = stdenvLinuxGlibc;
gcc = stdenvLinuxBoot2Pkgs.gcc.gcc;
};
extraAttrs = {inherit curl;};
@@ -198,9 +187,8 @@ rec {
stdenv = stdenvInitial;
gcc = wrapGCC {
# inherit (stdenvLinuxBoot2Pkgs) binutils;
binutils = stdenvLinuxBoot2Pkgs.binutils217;
glibc = stdenvLinuxGlibc;
inherit (stdenvLinuxBoot2Pkgs) binutils;
libc = stdenvLinuxGlibc;
gcc = stdenvLinuxBoot2Pkgs.gcc.gcc;
shell = stdenvLinuxBoot3Pkgs.bash + "/bin/sh";
};