summary refs log tree commit diff
path: root/pkgs/os-specific/linux/klibc
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-08 00:32:12 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-08 00:32:12 +0000
commit4b27d2870197b26b7c170caa333944231715d4a3 (patch)
tree6b781861cb96e9ce0660ca0b904ed3dda1cc6905 /pkgs/os-specific/linux/klibc
parent6e86ca940f9cb7fdbbf8663bc5c19af45fbc1e17 (diff)
downloadnixlib-4b27d2870197b26b7c170caa333944231715d4a3.tar
nixlib-4b27d2870197b26b7c170caa333944231715d4a3.tar.gz
nixlib-4b27d2870197b26b7c170caa333944231715d4a3.tar.bz2
nixlib-4b27d2870197b26b7c170caa333944231715d4a3.tar.lz
nixlib-4b27d2870197b26b7c170caa333944231715d4a3.tar.xz
nixlib-4b27d2870197b26b7c170caa333944231715d4a3.tar.zst
nixlib-4b27d2870197b26b7c170caa333944231715d4a3.zip
Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
Diffstat (limited to 'pkgs/os-specific/linux/klibc')
-rw-r--r--pkgs/os-specific/linux/klibc/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 7f4229efe85a..bfb76f32821f 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation {
   makeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"];
   
   preBuild = ''
+    sed -i /CONFIG_AEABI/d defconfig
+    echo "CONFIG_AEABI=y" >> defconfig
     makeFlags=$(eval "echo $makeFlags")
 
     mkdir linux