From 05ab87c7e16618e197702ffafb41d9de435a92ee Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sat, 31 Dec 2005 16:27:23 +0000 Subject: [PATCH] move some of the configuration into the builder from default.nix. Also add support for sparc svn path=/nixpkgs/trunk/; revision=4470 --- pkgs/development/tools/misc/binutils-cross/builder.sh | 8 ++++++++ pkgs/development/tools/misc/binutils-cross/default.nix | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/binutils-cross/builder.sh b/pkgs/development/tools/misc/binutils-cross/builder.sh index 788effe9b240..d588896f38bb 100644 --- a/pkgs/development/tools/misc/binutils-cross/builder.sh +++ b/pkgs/development/tools/misc/binutils-cross/builder.sh @@ -1,5 +1,13 @@ source $stdenv/setup +if test $cross = "arm-linux" ; then + configureFlags="--target=arm-linux" +elif test $cross = "mips-linux" ; then + configureFlags="--target=mips-linux" +elif test $cross = "sparc-linux" ; then + configureFlags="--target=sparc-linux" +fi + patchConfigure() { # Clear the default library search path. if test "$noSysDirs" = "1"; then diff --git a/pkgs/development/tools/misc/binutils-cross/default.nix b/pkgs/development/tools/misc/binutils-cross/default.nix index ae758611fff1..7d77baced373 100644 --- a/pkgs/development/tools/misc/binutils-cross/default.nix +++ b/pkgs/development/tools/misc/binutils-cross/default.nix @@ -8,5 +8,6 @@ stdenv.mkDerivation { md5 = "6a9d529efb285071dad10e1f3d2b2967"; }; inherit noSysDirs; - configureFlags = if cross=="arm-linux" then "--target=arm-linux" else if cross=="mips-linux" then "--target=mips-linux" else ""; + #configureFlags = if cross=="arm-linux" then "--target=arm-linux" else if cross=="mips-linux" then "--target=mips-linux" else if cross=="sparc-linux" then "--target=sparc-linux"; + inherit cross; }