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

Trying to make glibc211 build not only with the bootstrap-files compiler.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19581
This commit is contained in:
Lluís Batlle i Rossell 2010-01-20 19:13:18 +00:00
parent 9761d31dc9
commit a2a51f2ae3
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/glibc-2.11/builder.sh
View File

@ -32,7 +32,9 @@ postInstall() {
ln -s lib $out/lib64 ln -s lib $out/lib64
fi fi
rm $out/lib/libgcc_s.so.1 # This file, that should not remain in the glibc derivation,
# may have not been created during the preInstall
rm -f $out/lib/libgcc_s.so.1
} }

13
pkgs/development/libraries/glibc-2.11/default.nix
View File

@ -16,9 +16,18 @@ in
builder = ./builder.sh; builder = ./builder.sh;
# When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
# any program we run, because the gcc will have been placed at a new
# store path than that determined when built (as a source for the
# bootstrap-tools tarball)
# Building from a proper gcc staying in the path where it was installed,
# libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without
# any special hack.
preInstall = '' preInstall = ''
ensureDir $out/lib if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then
ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 ensureDir $out/lib
ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
fi
''; '';
meta.description = "The GNU C Library"; meta.description = "The GNU C Library";