Merge pull request #3465 from joelteon/picky-binutils

Stop binutils from trying to build on Darwin
This commit is contained in:
Michael Raskin 2014-09-03 19:57:09 +04:00
commit d81303813a
2 changed files with 7 additions and 3 deletions

View File

@ -2,6 +2,8 @@
, cross ? null, gold ? true, bison ? null
}:
assert !stdenv.isDarwin;
let basename = "binutils-2.23.1"; in
with { inherit (stdenv.lib) optional optionals optionalString; };

View File

@ -3917,9 +3917,11 @@ let
bam = callPackage ../development/tools/build-managers/bam {};
binutils = callPackage ../development/tools/misc/binutils {
inherit noSysDirs;
};
binutils = if stdenv.isDarwin
then stdenv.gcc.binutils
else callPackage ../development/tools/misc/binutils {
inherit noSysDirs;
};
binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils {
inherit noSysDirs;