Author: viric
Date: Thu Aug 5 13:39:08 2010
New Revision: 22963
URL: https://svn.nixos.org/websvn/nix/?rev=22963&sc=1
Log:
Making gcc not depend on bootstrap-tools (by a postInstall patchelf trick)
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/builder.sh
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/4.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/builder.sh
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/builder.sh
Thu Aug 5 13:32:58 2010 (r22962)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/builder.sh
Thu Aug 5 13:39:08 2010 (r22963)
@@ -181,6 +181,14 @@
# previous gcc.
rm -rf $out/libexec/gcc/*/*/install-tools
rm -rf $out/lib/gcc/*/*/install-tools
+
+ # More dependencies with the previous gcc or some libs (gccbug stores the
build command line)
+ rm -rf $out/bin/gccbug
+ # Take out the bootstrap-tools from the rpath, as it's not needed at all
having $out
+ for i in $out/libexec/gcc/*/*/*; do
+ PREV_RPATH=`patchelf --print-rpath $i`
+ patchelf --set-rpath `echo $PREV_RPATH | sed
's,:[^:]*bootstrap-tools/lib,,'` $i
+ done
# Get rid of some "fixed" header files
rm -rf $out/lib/gcc/*/*/include/root
Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/4.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/4.nix
Thu Aug 5 13:32:58 2010 (r22962)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/4.nix
Thu Aug 5 13:39:08 2010 (r22963)
@@ -23,7 +23,6 @@
dontDisableStatic = if static then true else false;
-
doCheck = true;
meta = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
