summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2011-04-08 13:03:53 +0000
committerShea Levy <shea@shealevy.com>2011-04-08 13:03:53 +0000
commit352dded9893a4dd3af1dffce7765a9c87e9a80dd (patch)
tree695f8705be884bc092324a116366b90383fb4d86 /pkgs/development
parent910a79f06d5ddf2aed455c8a6d622fcbee3eb114 (diff)
downloadnixlib-352dded9893a4dd3af1dffce7765a9c87e9a80dd.tar
nixlib-352dded9893a4dd3af1dffce7765a9c87e9a80dd.tar.gz
nixlib-352dded9893a4dd3af1dffce7765a9c87e9a80dd.tar.bz2
nixlib-352dded9893a4dd3af1dffce7765a9c87e9a80dd.tar.lz
nixlib-352dded9893a4dd3af1dffce7765a9c87e9a80dd.tar.xz
nixlib-352dded9893a4dd3af1dffce7765a9c87e9a80dd.tar.zst
nixlib-352dded9893a4dd3af1dffce7765a9c87e9a80dd.zip
Libelf isn't building on Darwin according to hydra, so remove libelf-dependent GCC-4.6 from Darwin
svn path=/nixpkgs/trunk/; revision=26753
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/compilers/gcc-4.6/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix
index 0d8f534e286d..631207001faa 100644
--- a/pkgs/development/compilers/gcc-4.6/default.nix
+++ b/pkgs/development/compilers/gcc-4.6/default.nix
@@ -401,7 +401,7 @@ stdenv.mkDerivation ({
     # Volunteers needed for the {Cyg,Dar}win ports of *PPL.
     # gnatboot is not available out of linux platforms, so we disable the darwin build
     # for the gnat (ada compiler).
-    platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ];
+    platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false && libelf == null) [ "i686-darwin" ];
   };
 }