about summary refs log tree commit diff
path: root/pkgs/stdenv/linux
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-08-24 22:29:58 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-08-24 22:29:58 +0000
commite7c47f424f14d4464abb805903a8050af2df6202 (patch)
tree54f803e973c5e71dc41008f8776fa1f9dfc28af2 /pkgs/stdenv/linux
parent7ab81fe75ff09044150b69f8f60d2f82bf946ba9 (diff)
downloadnixlib-e7c47f424f14d4464abb805903a8050af2df6202.tar
nixlib-e7c47f424f14d4464abb805903a8050af2df6202.tar.gz
nixlib-e7c47f424f14d4464abb805903a8050af2df6202.tar.bz2
nixlib-e7c47f424f14d4464abb805903a8050af2df6202.tar.lz
nixlib-e7c47f424f14d4464abb805903a8050af2df6202.tar.xz
nixlib-e7c47f424f14d4464abb805903a8050af2df6202.tar.zst
nixlib-e7c47f424f14d4464abb805903a8050af2df6202.zip
The uclibc used in bootstrap-tools needs some options to allow bzip2 to build
with it.


svn path=/nixpkgs/branches/stdenv-updates/; revision=23414
Diffstat (limited to 'pkgs/stdenv/linux')
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 6d23e3812f95..b89523cbc853 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -10,7 +10,15 @@ rec {
     aclSupport = false;
   });
 
-  gccLinkStatic = wrapGCCWith (import ../../build-support/gcc-wrapper) uclibc
+  # bzip2 wants utime.h, a header 'legacy' in uclibc
+  uclibcForBzip2 = uclibc.override {
+    extraConfig = ''
+        UCLIBC_SUSV3_LEGACY y
+        UCLIBC_SUSV4_LEGACY y
+    '';
+  };
+
+  gccLinkStatic = wrapGCCWith (import ../../build-support/gcc-wrapper) uclibcForBzip2
     stdenv.gcc.gcc;
   stdenvLinkStatic = overrideGCC stdenv gccLinkStatic;