summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2012-12-23 13:18:26 +0100
committerLluís Batlle i Rossell <viric@viric.name>2012-12-26 22:01:08 +0000
commit4c8bca317b03cd546b440b0d487bda53f85e8767 (patch)
treec859f5783628a5b66029f87f107691d41ab14429 /pkgs/stdenv
parenteeb9720b928d4f88cd0a03976dc027cc5918443f (diff)
downloadnixpkgs-4c8bca317b03cd546b440b0d487bda53f85e8767.tar
nixpkgs-4c8bca317b03cd546b440b0d487bda53f85e8767.tar.gz
nixpkgs-4c8bca317b03cd546b440b0d487bda53f85e8767.tar.bz2
nixpkgs-4c8bca317b03cd546b440b0d487bda53f85e8767.tar.lz
nixpkgs-4c8bca317b03cd546b440b0d487bda53f85e8767.tar.xz
nixpkgs-4c8bca317b03cd546b440b0d487bda53f85e8767.tar.zst
nixpkgs-4c8bca317b03cd546b440b0d487bda53f85e8767.zip
Improving the bootstrap tools (missing libs)
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix16
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
index 8be86eedb3e..afc5ed3d5c3 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
@@ -76,8 +76,12 @@ let
   gcc = pkgs.gcc47;
   gmp = pkgs.gmp.hostDrv;
   mpfr = pkgs.mpfr.hostDrv;
-  #ppl = pkgs.ppl.hostDrv;
-  #cloogppl = pkgs.cloogppl.hostDrv;
+  ppl = pkgs.ppl.hostDrv;
+  cloogppl = pkgs.cloogppl.hostDrv;
+  cloog = pkgs.cloog.hostDrv;
+  zlib = pkgs.zlib.hostDrv;
+  isl = pkgs.isl.hostDrv;
+  mpc = pkgs.mpc.hostDrv;
   binutils = pkgs.binutils.hostDrv;
   klibc = pkgs.klibc.hostDrv;
 
@@ -99,6 +103,8 @@ rec {
     linkStatic = true;
   };
 
+  inherit pkgs;
+
   build = 
 
     stdenv.mkDerivation {
@@ -178,6 +184,12 @@ rec {
 
         cp -d ${gmp}/lib/libgmp*.so* $out/lib
         cp -d ${mpfr}/lib/libmpfr*.so* $out/lib
+        cp -d ${cloogppl}/lib/libcloog*.so* $out/lib
+        cp -d ${cloog}/lib/libcloog*.so* $out/lib
+        cp -d ${ppl}/lib/libppl*.so* $out/lib
+        cp -d ${isl}/lib/libisl*.so* $out/lib
+        cp -d ${mpc}/lib/libmpc*.so* $out/lib
+        cp -d ${zlib}/lib/libz.so* $out/lib
         
         # Copy binutils.
         for i in as ld ar ranlib nm strip readelf objdump; do