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

* Some fixes for rebuilding the bootstrap binaries on x86_64.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9836
This commit is contained in:
Eelco Dolstra 2007-12-03 15:40:29 +00:00
parent 9a89e44870
commit 31034cb3d1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -1,6 +1,8 @@
{system ? builtins.currentSystem}:
let let
pkgs = import ../../top-level/all-packages.nix {}; pkgs = import ../../top-level/all-packages.nix {inherit system;};
# Have to do removeAttrs to prevent all-packages from copying # Have to do removeAttrs to prevent all-packages from copying
@ -37,14 +39,14 @@ let
gnutar = gnutar =
# Tar seems to be broken on dietlibc on x86_64. # Tar seems to be broken on dietlibc on x86_64.
if pkgs.stdenv.system != "x86_64-linux" if system != "x86_64-linux"
then pkgsDiet.gnutar151 # 1.16 is broken then pkgsDiet.gnutar151 # 1.16 is broken
else pkgsStatic.gnutar; else pkgsStatic.gnutar;
gawk = gawk =
# Dietlibc only provides sufficient math functions (fmod, sin, # Dietlibc only provides sufficient math functions (fmod, sin,
# cos, etc.) on i686. On other platforms, use Glibc. # cos, etc.) on i686. On other platforms, use Glibc.
if pkgs.stdenv.system == "i686-linux" if system == "i686-linux"
then pkgsDiet.gawk then pkgsDiet.gawk
else pkgsStatic.gawk; else pkgsStatic.gawk;

3
pkgs/stdenv/linux/make-bootstrap-tools.sh
View File

@ -88,7 +88,6 @@ cp -prd $gcc/libexec gcc
chmod -R +w gcc chmod -R +w gcc
nukeRefs gcc/libexec/gcc/*/*/cc1 nukeRefs gcc/libexec/gcc/*/*/cc1
nukeRefs gcc/libexec/gcc/*/*/collect2 nukeRefs gcc/libexec/gcc/*/*/collect2
rm -f gcc/lib/libmud* gcc/lib/libiberty* gcc/lib/libssp*
if test -e gcc/lib/libgcc_s.so.1; then if test -e gcc/lib/libgcc_s.so.1; then
nukeRefs gcc/lib/libgcc_s.so.1 nukeRefs gcc/lib/libgcc_s.so.1
fi fi
@ -97,10 +96,10 @@ if test -e $gcc/lib64; then
chmod -R +w gcc/lib64 chmod -R +w gcc/lib64
nukeRefs gcc/lib64/libgcc_s.so.1 nukeRefs gcc/lib64/libgcc_s.so.1
fi fi
rm -f gcc/lib*/libmud* gcc/lib*/libiberty* gcc/lib*/libssp* gcc/lib*/libgomp*
rm -rf gcc/lib/gcc/*/*/install-tools rm -rf gcc/lib/gcc/*/*/install-tools
rm -rf gcc/lib/gcc/*/*/include/root rm -rf gcc/lib/gcc/*/*/include/root
rm -rf gcc/lib/gcc/*/*/include/linux rm -rf gcc/lib/gcc/*/*/include/linux
rm -f gcc/lib/libgomp*
if test -e gcc/lib/gcc/powerpc-unknown-linux-gnu/4.1.1/include/bits/mathdef.h; then if test -e gcc/lib/gcc/powerpc-unknown-linux-gnu/4.1.1/include/bits/mathdef.h; then
nukeRefs gcc/lib/gcc/powerpc-unknown-linux-gnu/4.1.1/include/bits/mathdef.h nukeRefs gcc/lib/gcc/powerpc-unknown-linux-gnu/4.1.1/include/bits/mathdef.h
fi fi