From bc22ce3b7440ab39de831c7187fb8ae3dab270f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 1 Sep 2010 09:50:23 +0000 Subject: [PATCH] Setting the gcc --with-arch=fuloong2f only on mips64-linux. (what was there before was a temporary change not representing a working stdenv) svn path=/nixpkgs/branches/stdenv-updates/; revision=23589 --- pkgs/development/compilers/gcc-4.5/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 9eadb68f63e..91fbc666008 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -235,7 +235,8 @@ stdenv.mkDerivation ({ ) ) } - ${"--with-arch=loongson2f"} + ${ # Trick that should be taken out once we have a mips64-linux not loongson2f + if cross == null && stdenv.system == "mips64-linux" then "--with-arch=loongson2f" else ""} ${if langAda then " --enable-libada" else ""} ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""}