From bfcb644bb460333a58846954acbf31c7d4d24a16 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 31 Dec 2005 14:10:20 +0000
Subject: [PATCH] better layout, make sure we can differentiate between
 different configurations

svn path=/nixpkgs/trunk/; revision=4465
---
 pkgs/development/uclibc/builder.sh  |  1 +
 pkgs/development/uclibc/default.nix | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/uclibc/builder.sh b/pkgs/development/uclibc/builder.sh
index d4b5cdf0738..b8a4ba866e9 100644
--- a/pkgs/development/uclibc/builder.sh
+++ b/pkgs/development/uclibc/builder.sh
@@ -4,6 +4,7 @@ preBuild=preBuild
 
 preBuild() {
   cp $config .config
+  makeFlags="CROSS=$cross-";
 }
 
 genericBuild
diff --git a/pkgs/development/uclibc/default.nix b/pkgs/development/uclibc/default.nix
index c1da407c99d..a11d4fcb090 100644
--- a/pkgs/development/uclibc/default.nix
+++ b/pkgs/development/uclibc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gcc40arm, kernelHeadersArm, binutilsArm}:
+{stdenv, fetchurl, gccCross, kernelHeadersCross, binutilsCross, cross}:
 
 stdenv.mkDerivation {
   builder = ./builder.sh;
@@ -7,8 +7,13 @@ stdenv.mkDerivation {
     url = http://www.uclibc.org/downloads/uClibc-0.9.28.tar.bz2;
     md5 = "1ada58d919a82561061e4741fb6abd29";
   };
-  config = ./config;
-  inherit kernelHeadersArm;
-  buildInputs = [gcc40arm binutilsArm];
-  makeFlags="CROSS=arm-linux-";
+  config = if cross == "mips-linux"
+             then ./config-mips-linux
+           else if cross == "arm-linux"
+                  then ./config-arm-linux
+                else "";
+
+  inherit kernelHeadersCross;
+  buildInputs = [gccCross binutilsCross];
+  inherit cross;
 }