diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-03-29 21:56:01 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-03-29 21:56:01 +0100 |
| commit | c7307122bf76b6c69fe3249080b590d39245827c (patch) | |
| tree | 025dc7b6eb24ae6d237b76ca39ff04381cedf792 /pkgs/development/compilers | |
| parent | a76a9f783e53591372698f5bd09cb4ca3dc18699 (diff) | |
| download | nixlib-c7307122bf76b6c69fe3249080b590d39245827c.tar nixlib-c7307122bf76b6c69fe3249080b590d39245827c.tar.gz nixlib-c7307122bf76b6c69fe3249080b590d39245827c.tar.bz2 nixlib-c7307122bf76b6c69fe3249080b590d39245827c.tar.lz nixlib-c7307122bf76b6c69fe3249080b590d39245827c.tar.xz nixlib-c7307122bf76b6c69fe3249080b590d39245827c.tar.zst nixlib-c7307122bf76b6c69fe3249080b590d39245827c.zip | |
gcc47: Making the arm patch only for arm.
I don't know how, but it seems to break mips (noticed by ludo): http://hydra.nixos.org/build/4530024
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.7/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 3925ce1f7fa5..92411e6687e2 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -54,7 +54,8 @@ let version = "4.7.2"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; - patches = [ ./arm-eabi.patch ] + patches = [] + ++ optional stdenv.isArm [ ./arm-eabi.patch ] ++ optional (cross != null) ./libstdc++-target.patch # ++ optional noSysDirs ./no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its |